Changeset 6ec7f21 in rtems

Timestamp:

07/16/18 06:31:05 (5 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

da0cbef2

Parents:

00a19d6

git-author:

Sebastian Huber <sebastian.huber@…> (07/16/18 06:31:05)

git-committer:

Sebastian Huber <sebastian.huber@…> (07/16/18 06:58:11)

Message:

posix: Fix rwlock auto initialization

Add more test cases.

Files:

• cpukit/posix/src/prwlockunlock.c (modified) (1 diff)
• testsuites/psxtests/psx05/init.c (modified) (1 diff)
• testsuites/psxtests/psxcond01/init.c (modified) (2 diffs)
• testsuites/psxtests/psxrwlock01/test.c (modified) (1 diff)

cpukit/posix/src/prwlockunlock.c

@@ -36 +36 @@
   }
 
-  the_rwlock->flags = POSIX_RWLOCK_MAGIC;
+  the_rwlock->flags = (uintptr_t) the_rwlock ^ POSIX_RWLOCK_MAGIC;
   return true;
 }

testsuites/psxtests/psx05/init.c

@@ -375 +375 @@
     eno = pthread_mutex_lock( &mutex );
     rtems_test_assert( eno == 0 );
+
+    eno = pthread_mutex_unlock( &mutex );
+    rtems_test_assert( eno == 0 );
+
+    eno = pthread_mutex_destroy( &mutex );
+    rtems_test_assert( eno == 0 );
   }
 

testsuites/psxtests/psxcond01/init.c

@@ -52 +52 @@
 }
 
+static void test_cond_auto_initialization( void )
+{
+  int eno;
+
+  {
+    pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+
+    eno = pthread_cond_destroy( &cond );
+    rtems_test_assert( eno == 0 );
+
+    eno = pthread_cond_destroy( &cond );
+    rtems_test_assert( eno == EINVAL );
+  }
+
+  {
+    pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+
+    eno = pthread_cond_signal( &cond );
+    rtems_test_assert( eno == 0 );
+
+    eno = pthread_cond_destroy( &cond );
+    rtems_test_assert( eno == 0 );
+  }
+
+  {
+    pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+
+    eno = pthread_cond_broadcast( &cond );
+    rtems_test_assert( eno == 0 );
+
+    eno = pthread_cond_destroy( &cond );
+    rtems_test_assert( eno == 0 );
+  }
+}
+
 void *POSIX_Init(
   void *argument
@@ -60 +95 @@
 
   TEST_BEGIN();
+
+  test_cond_auto_initialization();
 
   puts( "Init - pthread_mutex_init - Mutex1 - OK" );

testsuites/psxtests/psxrwlock01/test.c

@@ -259 +259 @@
 
     eno = pthread_rwlock_rdlock( &rw );
+    rtems_test_assert( eno == 0 );
+
+    eno = pthread_rwlock_unlock( &rw );
+    rtems_test_assert( eno == 0 );
+
+    eno = pthread_rwlock_destroy( &rw );
     rtems_test_assert( eno == 0 );
   }