syscalls/getitimer: cleanup

index 56c56e0..03edf2f 100644
@@ -1,55 +1,28 @@
 /*
+ * Copyright (c) International Business Machines  Corp., 2001
  *
- *   Copyright (c) International Business Machines  Corp., 2001
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
  *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*
- * NAME
- *	getitimer01.c
- *
- * DESCRIPTION
- *	getitimer01 - check that a correct call to getitimer() succeeds
- *
- * ALGORITHM
- *	loop if that option was specified
- *	allocate needed space
- *	issue the system call
- *	check the errno value
- *	  issue a PASS message if we get zero
- *	otherwise, the tests fails
- *	  issue a FAIL message
- *	  break any remaining tests
- *	  call cleanup
- *
- * USAGE:  <for command-line>
- *  getitimer01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	03/2001 - Written by Wayne Boyer
- *
- * RESTRICTIONS
- *	none
- */
+  HISTORY
+    03/2001 - Written by Wayne Boyer
+
+  TEST ITEMS:
+    Check that a correct call to getitimer() succeeds.
+*/
 
 #include "test.h"
 #include "usctest.h"

@@ -57,8 +30,8 @@
 #include <errno.h>
 #include <sys/time.h>
 
-void cleanup(void);
-void setup(void);
+static void cleanup(void);
+static void setup(void);
 
 char *TCID = "getitimer01";
 int TST_TOTAL = 1;

@@ -67,37 +40,22 @@ int main(int ac, char **av)
 {
 	int lc;
 	char *msg;
-	struct itimerval *value;
+	struct itimerval value;
 
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	msg = parse_opts(ac, av, NULL, NULL);
+	if (msg != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
-	setup();		/* global setup */
-
-	/* The following loop checks looping state if -i option given */
+	setup();
 
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* reset tst_count in case we are looping */
 		tst_count = 0;
 
-		/* allocate space for the itimerval structure */
+		TEST(getitimer(ITIMER_REAL, &value));
 
-		if ((value = (struct itimerval *)malloc((size_t)
-							sizeof(struct
-							       itimerval))) ==
-		    NULL) {
-			tst_brkm(TBROK, cleanup, "value malloc failed");
-		}
-
-		/* call the system call with the TEST() macro */
-
-		TEST(getitimer(ITIMER_REAL, value));
-
-		if (TEST_RETURN != 0) {
+		if (TEST_RETURN != 0)
 			tst_resm(TFAIL, "call failed - errno = %d - %s",
 				 TEST_ERRNO, strerror(TEST_ERRNO));
-		}
 
 		if (STD_FUNCTIONAL_TEST) {
 

@@ -106,8 +64,8 @@ int main(int ac, char **av)
 			 * not set it before the getitimer call), the elements
 			 * in it_value should be zero.
 			 */
-			if ((value->it_value.tv_sec == 0) &&
-			    (value->it_value.tv_usec == 0)) {
+			if ((value.it_value.tv_sec == 0) &&
+			    (value.it_value.tv_usec == 0)) {
 				tst_resm(TPASS, "functional test passed");
 			} else {
 				tst_resm(TFAIL, "timer values are non zero");

@@ -122,27 +80,14 @@ int main(int ac, char **av)
 	tst_exit();
 }
 
-/*
- * setup() - performs all the ONE TIME setup for this test.
- */
-void setup(void)
+static void setup(void)
 {
-
 	tst_sig(NOFORK, DEF_HANDLER, cleanup);
 
 	TEST_PAUSE;
 }
 
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * 	       or premature exit.
- */
-void cleanup(void)
+static void cleanup(void)
 {
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
 	TEST_CLEANUP;
-
 }

143 lines not on this page · raw message

index 03edf2f..5569a49 100644
@@ -34,11 +34,18 @@ static void cleanup(void);
 static void setup(void);
 
 char *TCID = "getitimer01";
-int TST_TOTAL = 1;
+int TST_TOTAL = 3;
+
+static int itimer_name[] = {
+	ITIMER_REAL,
+	ITIMER_VIRTUAL,
+	ITIMER_PROF,
+};
 
 int main(int ac, char **av)
 {
 	int lc;
+	int i;
 	char *msg;
 	struct itimerval value;
 

@@ -51,27 +58,30 @@ int main(int ac, char **av)
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 		tst_count = 0;
 
-		TEST(getitimer(ITIMER_REAL, &value));
+		for (i = 0; i < 3; i++) {
+
+			TEST(getitimer(itimer_name[i], &value));
 
-		if (TEST_RETURN != 0)
-			tst_resm(TFAIL, "call failed - errno = %d - %s",
-				 TEST_ERRNO, strerror(TEST_ERRNO));
+			if (TEST_RETURN != 0)
+				tst_resm(TFAIL, "call failed - errno = %d - %s",
+					 TEST_ERRNO, strerror(TEST_ERRNO));
 
-		if (STD_FUNCTIONAL_TEST) {
+			if (STD_FUNCTIONAL_TEST) {
 
-			/*
-			 * Since ITIMER_REAL is effectively disabled (we did
-			 * not set it before the getitimer call), the elements
-			 * in it_value should be zero.
-			 */
-			if ((value.it_value.tv_sec == 0) &&
-			    (value.it_value.tv_usec == 0)) {
-				tst_resm(TPASS, "functional test passed");
+				/*
+				 * Since ITIMER is effectively disabled (we did
+				 * not set it before the getitimer call), the
+				 * elements in it_value should be zero.
+				 */
+				if ((value.it_value.tv_sec == 0) &&
+					(value.it_value.tv_usec == 0)) {
+					tst_resm(TPASS, "functionality is ok");
+				} else {
+					tst_resm(TFAIL, "timer are non zero");
+				}
 			} else {
-				tst_resm(TFAIL, "timer values are non zero");
+				tst_resm(TPASS, "call succeeded");
 			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
 		}
 	}