[Ltp-cvs] ltp/testcases/kernel/timers/clock_settime clock_settime02.c, 1.3, 1.4 clock_settime03.c, 1.3, 1.4

[Mike F. <va...@us...>]

Update of /cvsroot/ltp/ltp/testcases/kernel/timers/clock_settime
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8730/clock_settime

Modified Files:
	clock_settime02.c clock_settime03.c 
Log Message:
move common defines/functions/etc... to one header file so we have to get it right just once

Index: clock_settime02.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/timers/clock_settime/clock_settime02.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** clock_settime02.c	11 Feb 2006 07:27:18 -0000	1.3
--- clock_settime02.c	22 Aug 2006 05:43:15 -0000	1.4
***************
*** 65,113 ****
   *****************************************************************************/
  
! #include "test.h"
! #include "usctest.h"
  #include <errno.h>
- #include <syscall.h>
  #include <time.h>
  
! #ifndef _syscall2
! #include <linux/unistd.h>
! #endif
! 
! #ifndef __NR_timer_create
! #if defined(__i386__)
! #define __NR_timer_create 259
! #endif
! #endif
! 
! #ifndef __NR_clock_settime
! #if defined(__i386__)
! #define __NR_clock_settime (__NR_timer_create + 5)
! #elif defined(__ppc__)
! #define __NR_clock_settime 245
! #elif defined(__powerpc64__)
! #define __NR_clock_settime 245
! #elif defined(__x86_64__)
! #define __NR_clock_settime 227
! #endif
! #endif
! 
! #ifndef __NR_clock_gettime
! #if defined(__i386__)
! #define __NR_clock_gettime (__NR_timer_create + 6)
! #elif defined(__ppc__)
! #define __NR_clock_gettime 246
! #elif defined(__powerpc64__)
! #define __NR_clock_gettime 246
! #elif defined(__x86_64__)
! #define __NR_clock_gettime 228
! #endif
! #endif
! 
! /* weak symbols. In newer glibc, these symbols should be present. Then
!  * it will supersede the definition from this code using _syscall
!  */
! #pragma weak clock_settime
! #pragma weak clock_gettime
  
  static void setup();
--- 65,76 ----
   *****************************************************************************/
  
! #include <stdlib.h>
  #include <errno.h>
  #include <time.h>
+ #include <signal.h>
  
! #include "test.h"
! #include "usctest.h"
! #include "common_timers.h"
  
  static void setup();
***************
*** 119,127 ****
  static struct timespec saved;	/* Used to reset the time */
  
- /* register clock_settime and clock_gettime as system calls */
- _syscall2(int, clock_settime, clockid_t, which_clock, const struct timespec *,
- 	       tp);	
- _syscall2(int, clock_gettime, clockid_t, which_clock, struct timespec *, tp);	
- 
  int
  main(int ac, char **av)
--- 82,85 ----

Index: clock_settime03.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/timers/clock_settime/clock_settime03.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** clock_settime03.c	11 Feb 2006 07:27:18 -0000	1.3
--- clock_settime03.c	22 Aug 2006 05:43:15 -0000	1.4
***************
*** 71,147 ****
   *****************************************************************************/
  
- #include "test.h"
- #include "usctest.h"
  #include <errno.h>
- #include <syscall.h>
  #include <time.h>
  #include <pwd.h>
  
! #ifndef _syscall2
! #include <linux/unistd.h>
! #endif
! 
! 
! #ifndef __NR_timer_create
! #if defined(__i386__)
! #define __NR_timer_create 259
! #endif
! #endif
! 
! #ifndef __NR_clock_settime
! #if defined(__i386__)
! #define __NR_clock_settime (__NR_timer_create + 5)
! #elif defined(__ppc__)
! #define __NR_clock_settime 245
! #elif defined(__powerpc64__)
! #define __NR_clock_settime 245
! #elif defined(__x86_64__)
! #define __NR_clock_settime 227
! #endif
! #endif
! 
! #ifndef __NR_clock_gettime
! #if defined(__i386__)
! #define __NR_clock_gettime (__NR_timer_create + 6)
! #elif defined(__ppc__)
! #define __NR_clock_gettime 246
! #elif defined(__powerpc64__)
! #define __NR_clock_settime 246
! #elif defined(__x86_64__)
! #define __NR_clock_gettime 228
! #endif
! #endif
! 
! #ifndef NSEC_PER_SEC
! #define NSEC_PER_SEC (1000000000L)
! #endif
! #ifndef CLOCK_REALTIME
! #define CLOCK_REALTIME 0
! #endif
! #ifndef CLOCK_MONOTONIC
! #define CLOCK_MONOTONIC 1
! #endif
! #ifndef CLOCK_PROCESS_CPUTIME_ID
! #define CLOCK_PROCESS_CPUTIME_ID 2
! #endif
! #ifndef CLOCK_THREAD_CPUTIME_ID
! #define CLOCK_THREAD_CPUTIME_ID 3
! #endif
! #ifndef CLOCK_REALTIME_HR
! #define CLOCK_REALTIME_HR 4
! #endif
! #ifndef CLOCK_MONOTONIC_HR
! #define CLOCK_MONOTONIC_HR 5
! #endif
! #ifndef MAX_CLOCKS
! #define MAX_CLOCKS 6
! #endif
! 
! /* Weak symbols. In newer glibc versions, these functions should
!  * be defined. Then, that definition will supersede the definition in this 
!  * file with _syscall
!  */ 
! #pragma weak clock_settime
! #pragma weak clock_gettime
  
  static void setup();
--- 71,82 ----
   *****************************************************************************/
  
  #include <errno.h>
  #include <time.h>
  #include <pwd.h>
+ #include <unistd.h>
  
! #include "test.h"
! #include "usctest.h"
! #include "common_timers.h"
  
  static void setup();
***************
*** 164,172 ****
  };
  
- /* register clock_settime and clock_gettime as system calls */
- _syscall2(int, clock_settime, clockid_t, which_clock, const struct timespec *,
- 		tp);
- _syscall2(int, clock_gettime, clockid_t, which_clock, struct timespec *, tp);
- 
  static struct test_case_t {
  	char *err_desc;		/* error description */
--- 99,102 ----