[Lsb-messages] /var/www/bzr/lsb/devel/misc-test r2359: part 2 missing glibc funcs: two pthread interfaces (bug 3748)

Mats Wichmann mats at linuxfoundation.org
Thu Feb 21 19:44:47 UTC 2013


------------------------------------------------------------
revno: 2359
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: misc-test
timestamp: Thu 2013-02-21 12:44:47 -0700
message:
  part 2 missing glibc funcs: two pthread interfaces (bug 3748)
added:
  dynchk/libs/libpthread/pthread_condattr_getclock.c
  dynchk/libs/libpthread/pthread_condattr_setclock.c
modified:
  dynchk/liblsbdynchk.Version.i686
  dynchk/liblsbdynchk.Version.ia64
  dynchk/liblsbdynchk.Version.ppc
  dynchk/liblsbdynchk.Version.ppc64
  dynchk/liblsbdynchk.Version.s390
  dynchk/liblsbdynchk.Version.s390x
  dynchk/liblsbdynchk.Version.x86_64
  dynchk/libs/libpthread/gen.mk
  dynchk/tests/struct/validate_struct__GFileMonitorClass.c
  elfchk/dynsyms.c
  libchk/libpthread_so_0.c
  package/Makefile
-------------- next part --------------
=== modified file 'dynchk/liblsbdynchk.Version.i686'
--- a/dynchk/liblsbdynchk.Version.i686	2013-02-21 13:54:52 +0000
+++ b/dynchk/liblsbdynchk.Version.i686	2013-02-21 19:44:47 +0000
@@ -2135,6 +2135,8 @@
   posix_fadvise64;
   posix_fallocate64;
   pthread_barrierattr_getpshared;
+  pthread_condattr_getclock;
+  pthread_condattr_setclock;
 };
 
 GLIBC_2.3.4 {

=== modified file 'dynchk/liblsbdynchk.Version.ia64'
--- a/dynchk/liblsbdynchk.Version.ia64	2013-02-21 13:54:52 +0000
+++ b/dynchk/liblsbdynchk.Version.ia64	2013-02-21 19:44:47 +0000
@@ -2130,6 +2130,8 @@
   timer_gettime;
   timer_settime;
   pthread_barrierattr_getpshared;
+  pthread_condattr_getclock;
+  pthread_condattr_setclock;
 };
 
 GLIBC_2.3.4 {

=== modified file 'dynchk/liblsbdynchk.Version.ppc'
--- a/dynchk/liblsbdynchk.Version.ppc	2013-02-21 13:54:52 +0000
+++ b/dynchk/liblsbdynchk.Version.ppc	2013-02-21 19:44:47 +0000
@@ -2123,6 +2123,8 @@
   posix_fadvise64;
   posix_fallocate64;
   pthread_barrierattr_getpshared;
+  pthread_condattr_getclock;
+  pthread_condattr_setclock;
 };
 
 GLIBC_2.3.4 {

=== modified file 'dynchk/liblsbdynchk.Version.ppc64'
--- a/dynchk/liblsbdynchk.Version.ppc64	2013-02-21 13:54:52 +0000
+++ b/dynchk/liblsbdynchk.Version.ppc64	2013-02-21 19:44:47 +0000
@@ -789,6 +789,8 @@
   timer_gettime;
   timer_settime;
   pthread_barrierattr_getpshared;
+  pthread_condattr_getclock;
+  pthread_condattr_setclock;
 };
 
 GLIBC_2.3.4 {

=== modified file 'dynchk/liblsbdynchk.Version.s390'
--- a/dynchk/liblsbdynchk.Version.s390	2013-02-21 13:54:52 +0000
+++ b/dynchk/liblsbdynchk.Version.s390	2013-02-21 19:44:47 +0000
@@ -2131,6 +2131,8 @@
   posix_fadvise64;
   posix_fallocate64;
   pthread_barrierattr_getpshared;
+  pthread_condattr_getclock;
+  pthread_condattr_setclock;
 };
 
 GLIBC_2.3.4 {

=== modified file 'dynchk/liblsbdynchk.Version.s390x'
--- a/dynchk/liblsbdynchk.Version.s390x	2013-02-21 13:54:52 +0000
+++ b/dynchk/liblsbdynchk.Version.s390x	2013-02-21 19:44:47 +0000
@@ -2119,6 +2119,8 @@
   timer_gettime;
   timer_settime;
   pthread_barrierattr_getpshared;
+  pthread_condattr_getclock;
+  pthread_condattr_setclock;
 };
 
 GLIBC_2.3.4 {

=== modified file 'dynchk/liblsbdynchk.Version.x86_64'
--- a/dynchk/liblsbdynchk.Version.x86_64	2013-02-21 13:54:52 +0000
+++ b/dynchk/liblsbdynchk.Version.x86_64	2013-02-21 19:44:47 +0000
@@ -2114,6 +2114,8 @@
   timer_gettime;
   timer_settime;
   pthread_barrierattr_getpshared;
+  pthread_condattr_getclock;
+  pthread_condattr_setclock;
 };
 
 GLIBC_2.3.4 {

=== modified file 'dynchk/libs/libpthread/gen.mk'
--- a/dynchk/libs/libpthread/gen.mk	2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libpthread/gen.mk	2013-02-21 19:44:47 +0000
@@ -36,8 +36,10 @@
 pthread_cond_timedwait.o \
 pthread_cond_wait.o \
 pthread_condattr_destroy.o \
+pthread_condattr_getclock.o \
 pthread_condattr_getpshared.o \
 pthread_condattr_init.o \
+pthread_condattr_setclock.o \
 pthread_condattr_setpshared.o \
 pthread_create.o \
 pthread_detach.o \

=== added file 'dynchk/libs/libpthread/pthread_condattr_getclock.c'
--- a/dynchk/libs/libpthread/pthread_condattr_getclock.c	1970-01-01 00:00:00 +0000
+++ b/dynchk/libs/libpthread/pthread_condattr_getclock.c	2013-02-21 19:44:47 +0000
@@ -0,0 +1,38 @@
+// Generated by gen_lib.pl
+
+#include "../../tests/type_tests.h"
+#include "../../misc/lsb_output.h"
+#include "stdlib.h"
+#include <pthread.h>
+#include <sys/types.h>
+#undef pthread_condattr_getclock
+static int(*funcptr) (const pthread_condattr_t * , clockid_t * ) = 0;
+
+extern int __lsb_check_params;
+int pthread_condattr_getclock (const pthread_condattr_t * arg0 , clockid_t * arg1 )
+{
+	int reset_flag = __lsb_check_params;
+	int ret_value  ;
+	__lsb_output(4, "Invoking wrapper for pthread_condattr_getclock()");
+	if(!funcptr)
+		#if 1
+			funcptr = dlvsym(RTLD_NEXT, "pthread_condattr_getclock", "GLIBC_2.3.3");
+		#endif
+	if(!funcptr) {
+		__lsb_output(-1, "Failed to load pthread_condattr_getclock. Probably the library was loaded using dlopen, we don't support this at the moment.");
+		exit(1);
+	}
+	if(__lsb_check_params)
+	{
+		__lsb_check_params=0;
+		__lsb_output(4, "pthread_condattr_getclock() - validating");
+		validate_Rdaddress( arg0, "pthread_condattr_getclock - arg0 (attr)");
+		validate_NULL_TYPETYPE(  arg0, "pthread_condattr_getclock - arg0 (attr)");
+		validate_RWaddress( arg1, "pthread_condattr_getclock - arg1 (clock_id)");
+		validate_NULL_TYPETYPE(  arg1, "pthread_condattr_getclock - arg1 (clock_id)");
+	}
+	ret_value = funcptr(arg0, arg1);
+	__lsb_check_params = reset_flag;
+	return ret_value;
+}
+

=== added file 'dynchk/libs/libpthread/pthread_condattr_setclock.c'
--- a/dynchk/libs/libpthread/pthread_condattr_setclock.c	1970-01-01 00:00:00 +0000
+++ b/dynchk/libs/libpthread/pthread_condattr_setclock.c	2013-02-21 19:44:47 +0000
@@ -0,0 +1,37 @@
+// Generated by gen_lib.pl
+
+#include "../../tests/type_tests.h"
+#include "../../misc/lsb_output.h"
+#include "stdlib.h"
+#include <pthread.h>
+#include <sys/types.h>
+#undef pthread_condattr_setclock
+static int(*funcptr) (pthread_condattr_t * , clockid_t ) = 0;
+
+extern int __lsb_check_params;
+int pthread_condattr_setclock (pthread_condattr_t * arg0 , clockid_t arg1 )
+{
+	int reset_flag = __lsb_check_params;
+	int ret_value  ;
+	__lsb_output(4, "Invoking wrapper for pthread_condattr_setclock()");
+	if(!funcptr)
+		#if 1
+			funcptr = dlvsym(RTLD_NEXT, "pthread_condattr_setclock", "GLIBC_2.3.3");
+		#endif
+	if(!funcptr) {
+		__lsb_output(-1, "Failed to load pthread_condattr_setclock. Probably the library was loaded using dlopen, we don't support this at the moment.");
+		exit(1);
+	}
+	if(__lsb_check_params)
+	{
+		__lsb_check_params=0;
+		__lsb_output(4, "pthread_condattr_setclock() - validating");
+		validate_RWaddress( arg0, "pthread_condattr_setclock - arg0 (attr)");
+		validate_NULL_TYPETYPE(  arg0, "pthread_condattr_setclock - arg0 (attr)");
+		validate_NULL_TYPETYPE(  arg1, "pthread_condattr_setclock - arg1 (clock_id)");
+	}
+	ret_value = funcptr(arg0, arg1);
+	__lsb_check_params = reset_flag;
+	return ret_value;
+}
+

=== modified file 'dynchk/tests/struct/validate_struct__GFileMonitorClass.c'
--- a/dynchk/tests/struct/validate_struct__GFileMonitorClass.c	2013-02-15 14:15:41 +0000
+++ b/dynchk/tests/struct/validate_struct__GFileMonitorClass.c	2013-02-21 19:44:47 +0000
@@ -10,10 +10,10 @@
 		failure = 1;
 	if(validate_NULL_TYPETYPE(input-> changed,name ))
 		failure = 1;
+	if(validate_NULL_TYPETYPE(input-> _g_reserved1,name ))
+		failure = 1;
 	if(validate_NULL_TYPETYPE(input-> cancel,name ))
 		failure = 1;
-	if(validate_NULL_TYPETYPE(input-> _g_reserved1,name ))
-		failure = 1;
 	if(validate_NULL_TYPETYPE(input-> _g_reserved2,name ))
 		failure = 1;
 	if(validate_NULL_TYPETYPE(input-> _g_reserved3,name ))

=== modified file 'elfchk/dynsyms.c'
--- a/elfchk/dynsyms.c	2013-02-21 13:54:52 +0000
+++ b/elfchk/dynsyms.c	2013-02-21 19:44:47 +0000
@@ -447327,6 +447327,7 @@
 #if defined __x86_64__
 	{"pthread_condattr_destroy","GLIBC_2.2.5",0,LSB_Base},
 #endif
+	{"pthread_condattr_getclock","GLIBC_2.3.3",0,LSB_Base},
 #if defined __i386__
 	{"pthread_condattr_getpshared","GLIBC_2.2",0,LSB_Base},
 #endif
@@ -447369,6 +447370,7 @@
 #if defined __x86_64__
 	{"pthread_condattr_init","GLIBC_2.2.5",0,LSB_Base},
 #endif
+	{"pthread_condattr_setclock","GLIBC_2.3.3",0,LSB_Base},
 #if defined __i386__
 	{"pthread_condattr_setpshared","GLIBC_2.2",0,LSB_Base},
 #endif

=== modified file 'libchk/libpthread_so_0.c'
--- a/libchk/libpthread_so_0.c	2012-04-11 16:21:39 +0000
+++ b/libchk/libpthread_so_0.c	2013-02-21 19:44:47 +0000
@@ -1242,6 +1242,7 @@
 #if defined __x86_64__
 	{"pthread_condattr_destroy","GLIBC_2.2.5",0,LSB_Core,4,1},
 #endif
+	{"pthread_condattr_getclock","GLIBC_2.3.3",0,LSB_Core,0,1},
 #if defined __i386__
 	{"pthread_condattr_getpshared","GLIBC_2.2",0,LSB_Core,4,1},
 #endif
@@ -1284,6 +1285,7 @@
 #if defined __x86_64__
 	{"pthread_condattr_init","GLIBC_2.2.5",0,LSB_Core,4,1},
 #endif
+	{"pthread_condattr_setclock","GLIBC_2.3.3",0,LSB_Core,0,1},
 #if defined __i386__
 	{"pthread_condattr_setpshared","GLIBC_2.2",0,LSB_Core,4,1},
 #endif

=== modified file 'package/Makefile'
--- a/package/Makefile	2013-02-21 13:54:52 +0000
+++ b/package/Makefile	2013-02-21 19:44:47 +0000
@@ -24,7 +24,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=1
+RPM_PACKAGE_RELEASE=2
 
 # Derive date string for daily snapshots
 ISO_DATE:=$(shell date +"%Y%m%d")



More information about the lsb-messages mailing list