svn commit: r265460 - in user/dchagin/lemul/sys: amd64/linux amd64/linux32 i386/linux

[Dmitry Chagin]

Author: dchagin
Date: Tue May  6 19:38:16 2014
New Revision: 265460
URL: http://svnweb.freebsd.org/changeset/base/265460

Log:
  Change linux clock_gettime, clock_settime, clock_getres,
  clock_nanosleep syscalls definition to match actual linux one.

Modified:
  user/dchagin/lemul/sys/amd64/linux/linux.h
  user/dchagin/lemul/sys/amd64/linux/syscalls.master
  user/dchagin/lemul/sys/amd64/linux32/linux.h
  user/dchagin/lemul/sys/amd64/linux32/syscalls.master
  user/dchagin/lemul/sys/i386/linux/linux.h
  user/dchagin/lemul/sys/i386/linux/syscalls.master

Modified: user/dchagin/lemul/sys/amd64/linux/linux.h
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux/linux.h	Tue May  6 19:18:20 2014	(r265459)
+++ user/dchagin/lemul/sys/amd64/linux/linux.h	Tue May  6 19:38:16 2014	(r265460)
@@ -79,6 +79,7 @@ typedef l_long		l_time_t;
 typedef l_int		l_timer_t;
 typedef l_int		l_mqd_t;
 typedef l_size_t	l_socklen_t;
+typedef	l_int		l_clockid_t;
 
 typedef struct {
 	l_int		val[2];

Modified: user/dchagin/lemul/sys/amd64/linux/syscalls.master
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux/syscalls.master	Tue May  6 19:18:20 2014	(r265459)
+++ user/dchagin/lemul/sys/amd64/linux/syscalls.master	Tue May  6 19:38:16 2014	(r265460)
@@ -389,10 +389,10 @@
 224	AUE_NULL	STD	{ int linux_timer_gettime(void); }
 225	AUE_NULL	STD	{ int linux_timer_getoverrun(void); }
 226	AUE_NULL	STD	{ int linux_timer_delete(void); }
-227	AUE_CLOCK_SETTIME	STD	{ int linux_clock_settime(clockid_t which, struct l_timespec *tp); }
-228	AUE_NULL	STD	{ int linux_clock_gettime(clockid_t which, struct l_timespec *tp); }
-229	AUE_NULL	STD	{ int linux_clock_getres(clockid_t which, struct l_timespec *tp); }
-230	AUE_NULL	STD	{ int linux_clock_nanosleep(clockid_t which, int flags, \
+227	AUE_CLOCK_SETTIME	STD	{ int linux_clock_settime(l_clockid_t which, struct l_timespec *tp); }
+228	AUE_NULL	STD	{ int linux_clock_gettime(l_clockid_t which, struct l_timespec *tp); }
+229	AUE_NULL	STD	{ int linux_clock_getres(l_clockid_t which, struct l_timespec *tp); }
+230	AUE_NULL	STD	{ int linux_clock_nanosleep(l_clockid_t which, int flags, \
 				    struct l_timespec *rqtp, struct l_timespec *rmtp); }
 231	AUE_EXIT	STD	{ int linux_exit_group(int error_code); }
 232	AUE_NULL	STD	{ int linux_epoll_wait(l_int epfd, struct epoll_event *events, \

Modified: user/dchagin/lemul/sys/amd64/linux32/linux.h
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux.h	Tue May  6 19:18:20 2014	(r265459)
+++ user/dchagin/lemul/sys/amd64/linux32/linux.h	Tue May  6 19:38:16 2014	(r265460)
@@ -94,6 +94,7 @@ typedef l_uint		l_uid_t;
 typedef l_ushort	l_uid16_t;
 typedef l_int		l_timer_t;
 typedef l_int		l_mqd_t;
+typedef l_int		l_clockid_t;
 
 typedef struct {
 	l_int		val[2];

Modified: user/dchagin/lemul/sys/amd64/linux32/syscalls.master
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/syscalls.master	Tue May  6 19:18:20 2014	(r265459)
+++ user/dchagin/lemul/sys/amd64/linux32/syscalls.master	Tue May  6 19:38:16 2014	(r265460)
@@ -442,10 +442,10 @@
 261	AUE_NULL	STD	{ int linux_timer_gettime(void); }
 262	AUE_NULL	STD	{ int linux_timer_getoverrun(void); }
 263	AUE_NULL	STD	{ int linux_timer_delete(void); }
-264	AUE_CLOCK_SETTIME	STD	{ int linux_clock_settime(clockid_t which, struct l_timespec *tp); }
-265	AUE_NULL	STD	{ int linux_clock_gettime(clockid_t which, struct l_timespec *tp); }
-266	AUE_NULL	STD	{ int linux_clock_getres(clockid_t which, struct l_timespec *tp); }
-267	AUE_NULL	STD	{ int linux_clock_nanosleep(clockid_t which, int flags, \
+264	AUE_CLOCK_SETTIME	STD	{ int linux_clock_settime(l_clockid_t which, struct l_timespec *tp); }
+265	AUE_NULL	STD	{ int linux_clock_gettime(l_clockid_t which, struct l_timespec *tp); }
+266	AUE_NULL	STD	{ int linux_clock_getres(l_clockid_t which, struct l_timespec *tp); }
+267	AUE_NULL	STD	{ int linux_clock_nanosleep(l_clockid_t which, int flags, \
 					struct l_timespec *rqtp, struct l_timespec *rmtp); }
 268	AUE_STATFS	STD	{ int linux_statfs64(char *path, size_t bufsize, struct l_statfs64_buf *buf); }
 269	AUE_FSTATFS	STD	{ int linux_fstatfs64(void); }

Modified: user/dchagin/lemul/sys/i386/linux/linux.h
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux.h	Tue May  6 19:18:20 2014	(r265459)
+++ user/dchagin/lemul/sys/i386/linux/linux.h	Tue May  6 19:38:16 2014	(r265460)
@@ -88,6 +88,7 @@ typedef l_uint		l_uid_t;
 typedef l_ushort	l_uid16_t;
 typedef l_int		l_timer_t;
 typedef l_int		l_mqd_t;
+typedef	l_int		l_clockid_t;
 
 typedef struct {
 	l_int		val[2];

Modified: user/dchagin/lemul/sys/i386/linux/syscalls.master
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/syscalls.master	Tue May  6 19:18:20 2014	(r265459)
+++ user/dchagin/lemul/sys/i386/linux/syscalls.master	Tue May  6 19:38:16 2014	(r265460)
@@ -446,10 +446,10 @@
 261	AUE_NULL	STD	{ int linux_timer_gettime(l_timer_t timerid, struct itimerspec *setting); }
 262	AUE_NULL	STD	{ int linux_timer_getoverrun(l_timer_t timerid); }
 263	AUE_NULL	STD	{ int linux_timer_delete(l_timer_t timerid); }
-264	AUE_CLOCK_SETTIME	STD	{ int linux_clock_settime(clockid_t which, struct l_timespec *tp); }
-265	AUE_NULL	STD	{ int linux_clock_gettime(clockid_t which, struct l_timespec *tp); }
-266	AUE_NULL	STD	{ int linux_clock_getres(clockid_t which, struct l_timespec *tp); }
-267	AUE_NULL	STD	{ int linux_clock_nanosleep(clockid_t which, int flags, \
+264	AUE_CLOCK_SETTIME	STD	{ int linux_clock_settime(l_clockid_t which, struct l_timespec *tp); }
+265	AUE_NULL	STD	{ int linux_clock_gettime(l_clockid_t which, struct l_timespec *tp); }
+266	AUE_NULL	STD	{ int linux_clock_getres(l_clockid_t which, struct l_timespec *tp); }
+267	AUE_NULL	STD	{ int linux_clock_nanosleep(l_clockid_t which, int flags, \
 					struct l_timespec *rqtp, struct l_timespec *rmtp); }
 268	AUE_STATFS	STD	{ int linux_statfs64(char *path, size_t bufsize, struct l_statfs64_buf *buf); }
 269	AUE_FSTATFS	STD	{ int linux_fstatfs64(void); }