change log for rtems (2011-08-04)

rtems-vc at rtems.org rtems-vc at rtems.org
Thu Aug 4 15:10:19 UTC 2011


 *joel*:
2011-08-04	Joel Sherrill <joel.sherrill at oarcorp.com>

	* psxtmrwlock03/init.c: Fix abstime issue. Time is now reasonable.

M   1.42  testsuites/psxtmtests/ChangeLog
M    1.2  testsuites/psxtmtests/psxtmrwlock03/init.c

diff -u rtems/testsuites/psxtmtests/ChangeLog:1.41 rtems/testsuites/psxtmtests/ChangeLog:1.42
--- rtems/testsuites/psxtmtests/ChangeLog:1.41	Tue Aug  2 12:20:18 2011
+++ rtems/testsuites/psxtmtests/ChangeLog	Thu Aug  4 09:42:05 2011
@@ -1,3 +1,7 @@
+2011-08-04	Joel Sherrill <joel.sherrill at oarcorp.com>
+
+	* psxtmrwlock03/init.c: Fix abstime issue. Time is now reasonable.
+
 2011-08-02	Ricardo Aguirre <el.mastin at ymail.com>
 
 	PR 1880/tests

diff -u rtems/testsuites/psxtmtests/psxtmrwlock03/init.c:1.1 rtems/testsuites/psxtmtests/psxtmrwlock03/init.c:1.2
--- rtems/testsuites/psxtmtests/psxtmrwlock03/init.c:1.1	Tue Aug  2 10:17:17 2011
+++ rtems/testsuites/psxtmtests/psxtmrwlock03/init.c	Thu Aug  4 09:42:05 2011
@@ -22,6 +22,7 @@
 #include "test_support.h"
 
 pthread_rwlock_t     rwlock;
+struct timespec      abstime;
 
 void *Low(
   void *argument
@@ -58,10 +59,6 @@
 )
 {
   int status;
-  struct timespec      abstime;
-
-  abstime.tv_sec = 0;
-  abstime.tv_nsec = 0;
 
   /*
    * Now we have finished the thread startup overhead,
@@ -74,9 +71,7 @@
   /* this timed read lock operation will be blocked
    * cause a write operation has the lock */
     status = pthread_rwlock_timedrdlock(&rwlock, &abstime);
-  /*status should be non zero, cause read lock is refused...
-   * blocked during abstime */
-  rtems_test_assert( status == ETIMEDOUT );
+  rtems_test_assert( status == 0 );
   return NULL;
 }
 
@@ -100,6 +95,13 @@
   rtems_test_assert( !status );
 
   /*
+   *  Timeout for 5 seconds from now.
+   */
+  status = clock_gettime( CLOCK_REALTIME, &abstime );
+  rtems_test_assert( !status );
+  abstime.tv_sec += 5;
+
+  /*
    * Deliberately create the rwlock after the threads.  This way if the
    * threads do run before we intend, they will get an error.
    */


 *joel*:
2011-08-04	Ricardo Aguirre <el.mastin at ymail.com>

	PR 1881/tests
	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
	pthread_rwlock_timedwrlock - not available, blocks.
	* psxtmrwlock05/.cvsignore, psxtmrwlock05/Makefile.am,
	psxtmrwlock05/init.c, psxtmrwlock05/psxtmrwlock05.doc: New files.

M   1.43  testsuites/psxtmtests/ChangeLog
M   1.25  testsuites/psxtmtests/Makefile.am
M   1.28  testsuites/psxtmtests/configure.ac
A    1.1  testsuites/psxtmtests/psxtmrwlock05/.cvsignore
A    1.1  testsuites/psxtmtests/psxtmrwlock05/Makefile.am
A    1.1  testsuites/psxtmtests/psxtmrwlock05/init.c
A    1.1  testsuites/psxtmtests/psxtmrwlock05/psxtmrwlock05.doc
M   1.27  testsuites/psxtmtests/psxtmtests_plan.csv

diff -u rtems/testsuites/psxtmtests/ChangeLog:1.42 rtems/testsuites/psxtmtests/ChangeLog:1.43
--- rtems/testsuites/psxtmtests/ChangeLog:1.42	Thu Aug  4 09:42:05 2011
+++ rtems/testsuites/psxtmtests/ChangeLog	Thu Aug  4 10:02:06 2011
@@ -1,3 +1,11 @@
+2011-08-04	Ricardo Aguirre <el.mastin at ymail.com>
+
+	PR 1881/tests
+	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
+	pthread_rwlock_timedwrlock - not available, blocks.
+	* psxtmrwlock05/.cvsignore, psxtmrwlock05/Makefile.am,
+	psxtmrwlock05/init.c, psxtmrwlock05/psxtmrwlock05.doc: New files.
+
 2011-08-04	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	* psxtmrwlock03/init.c: Fix abstime issue. Time is now reasonable.

diff -u rtems/testsuites/psxtmtests/Makefile.am:1.24 rtems/testsuites/psxtmtests/Makefile.am:1.25
--- rtems/testsuites/psxtmtests/Makefile.am:1.24	Tue Aug  2 12:20:18 2011
+++ rtems/testsuites/psxtmtests/Makefile.am	Thu Aug  4 10:02:06 2011
@@ -25,6 +25,7 @@
 SUBDIRS += psxtmrwlock02
 SUBDIRS += psxtmrwlock03
 SUBDIRS += psxtmrwlock04
+SUBDIRS += psxtmrwlock05
 SUBDIRS += psxtmsem01
 SUBDIRS += psxtmsem02
 SUBDIRS += psxtmsem03

diff -u rtems/testsuites/psxtmtests/configure.ac:1.27 rtems/testsuites/psxtmtests/configure.ac:1.28
--- rtems/testsuites/psxtmtests/configure.ac:1.27	Tue Aug  2 12:20:18 2011
+++ rtems/testsuites/psxtmtests/configure.ac	Thu Aug  4 10:02:06 2011
@@ -97,6 +97,7 @@
 psxtmrwlock02/Makefile
 psxtmrwlock03/Makefile
 psxtmrwlock04/Makefile
+psxtmrwlock05/Makefile
 psxtmsem01/Makefile
 psxtmsem02/Makefile
 psxtmsem03/Makefile

diff -u /dev/null rtems/testsuites/psxtmtests/psxtmrwlock05/.cvsignore:1.1
--- /dev/null	Thu Aug  4 10:10:18 2011
+++ rtems/testsuites/psxtmtests/psxtmrwlock05/.cvsignore	Thu Aug  4 10:02:06 2011
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff -u /dev/null rtems/testsuites/psxtmtests/psxtmrwlock05/Makefile.am:1.1
--- /dev/null	Thu Aug  4 10:10:18 2011
+++ rtems/testsuites/psxtmtests/psxtmrwlock05/Makefile.am	Thu Aug  4 10:02:06 2011
@@ -0,0 +1,30 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = psxtmrwlock05
+psxtmrwlock05_SOURCES = init.c ../../tmtests/include/timesys.h \
+    ../../support/src/tmtests_empty_function.c \
+    ../../support/src/tmtests_support.c
+
+dist_rtems_tests_DATA = psxtmrwlock05.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+OPERATION_COUNT = @OPERATION_COUNT@
+AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
+AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(psxtmrwlock05_OBJECTS) $(psxtmrwlock05_LDADD)
+LINK_LIBS = $(psxtmrwlock05_LDLIBS)
+
+psxtmrwlock05$(EXEEXT): $(psxtmrwlock05_OBJECTS) $(psxtmrwlock05_DEPENDENCIES)
+	@rm -f psxtmrwlock05$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am

diff -u /dev/null rtems/testsuites/psxtmtests/psxtmrwlock05/init.c:1.1
--- /dev/null	Thu Aug  4 10:10:19 2011
+++ rtems/testsuites/psxtmtests/psxtmrwlock05/init.c	Thu Aug  4 10:02:06 2011
@@ -0,0 +1,143 @@
+/*
+ *  COPYRIGHT (c) 1989-2011.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <coverhd.h>
+#include <errno.h>
+#include <timesys.h>
+#include <tmacros.h>
+#include <sched.h>
+#include <pthread.h>
+#include <rtems/timerdrv.h>
+#include "test_support.h"
+
+pthread_rwlock_t     rwlock;
+struct timespec      abstime;
+
+void *Low(
+  void *argument
+)
+{
+  uint32_t end_time;
+
+  /*
+   * Now we have finished the thread startup overhead,
+   * so let other threads run.  When we return, we can
+   * finish the benchmark.
+   */
+  sched_yield();
+    /* let other threads run */
+
+  end_time = benchmark_timer_read();
+
+  put_time(
+    "pthread_rwlock_timedwrlock - not available, blocks",
+    end_time,
+    OPERATION_COUNT,
+    0,
+    0
+  );
+
+  puts( "*** END OF POSIX TIME PSXTMRWLOCK 05 TEST ***" );
+
+  rtems_test_exit( 0 );
+  return NULL;
+}
+
+void *Middle(
+  void *argument
+)
+{
+  int status;
+
+  /*
+   * Now we have finished the thread startup overhead,
+   * so let other threads run.  When we return, we can
+   * finish the benchmark.
+   */
+  sched_yield();
+    /* let other threads run */
+
+  /* This timed write lock operation will be blocked 
+   * because the other write operation has the lock
+   */
+    status = pthread_rwlock_timedwrlock(&rwlock, &abstime);
+  rtems_test_assert( status == 0 );
+  return NULL;
+}
+
+void *POSIX_Init(
+  void *argument
+)
+{
+  int        i;
+  int        status;
+  pthread_t  threadId;
+  pthread_rwlockattr_t attr;
+
+  puts( "\n\n*** POSIX TIME PSXTMRWLOCK 05 TEST ***" );
+
+  for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
+    status = pthread_create( &threadId, NULL, Middle, NULL );
+    rtems_test_assert( !status );
+  }
+  
+  status = pthread_create( &threadId, NULL, Low, NULL );
+  rtems_test_assert( !status );
+
+  /*
+   *  Timeout for 5 seconds from now.
+   */
+  status = clock_gettime( CLOCK_REALTIME, &abstime );
+  rtems_test_assert( !status );
+  abstime.tv_sec += 5;
+
+  /*
+   * Deliberately create the rwlock after the threads.  This way if the
+   * threads do run before we intend, they will get an error.
+   */
+  status = pthread_rwlockattr_init( &attr );
+  rtems_test_assert( status == 0 );
+    status = pthread_rwlock_init( &rwlock, &attr );
+  rtems_test_assert( status == 0 );
+  /*
+   * Let the other threads start so the thread startup overhead,
+   * is accounted for.  When we return, we can start the benchmark.
+   */
+  sched_yield();
+    /* let other threads run */
+
+  
+  /* start the timer and switch through all the other tasks */
+  benchmark_timer_initialize();
+
+  /* write lock operation, this could be any write lock
+   * I decided to use timedwrlock just to continue in the timed line  */
+    status = pthread_rwlock_timedwrlock(&rwlock,0);
+  rtems_test_assert( status == 0 );
+  return NULL;
+}
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS     OPERATION_COUNT + 2
+#define CONFIGURE_MAXIMUM_POSIX_RWLOCKS     1
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
+  /* end of file */

diff -u /dev/null rtems/testsuites/psxtmtests/psxtmrwlock05/psxtmrwlock05.doc:1.1
--- /dev/null	Thu Aug  4 10:10:19 2011
+++ rtems/testsuites/psxtmtests/psxtmrwlock05/psxtmrwlock05.doc	Thu Aug  4 10:02:06 2011
@@ -0,0 +1,14 @@
+#
+#  $Id$
+#
+#  COPYRIGHT (c) 1989-2011.
+#  On-Line Applications Research Corporation (OAR).
+#
+#  The license and distribution terms for this file may be
+#  found in the file LICENSE in this distribution or at
+#  http://www.rtems.com/license/LICENSE.
+#
+
+This test benchmarks the following operations:
+
++ pthread_rwlock_timedwrlock - not available, blocks

diff -u rtems/testsuites/psxtmtests/psxtmtests_plan.csv:1.26 rtems/testsuites/psxtmtests/psxtmtests_plan.csv:1.27
--- rtems/testsuites/psxtmtests/psxtmtests_plan.csv:1.26	Tue Aug  2 12:20:18 2011
+++ rtems/testsuites/psxtmtests/psxtmtests_plan.csv	Thu Aug  4 10:02:06 2011
@@ -79,7 +79,7 @@
 "pthread_rwlock_trywrlock - available","psxtmrwlock01","psxtmtest_single","Yes"
 "pthread_rwlock_trywrlock - not available",,"psxtmtest_single",
 "pthread_rwlock_timedwrlock - available","psxtmrwlock01","psxtmtest_single","Yes"
-"pthread_rwlock_timedwrlock - not available, blocks",,"psxtmtest_blocking",
+"pthread_rwlock_timedwrlock - not available, blocks","psxtmrwlock05","psxtmtest_blocking","Yes"
 ,,,
 "mq_open (first open)","psxtmmq01","psxtmtest_init_destroy",
 "mq_close (close of first)","psxtmmq01","psxtmtest_init_destroy",


 *joel*:
2011-08-04	Ricardo Aguirre <el.mastin at ymail.com>

	* psxtmrwlock01/init.c, psxtmrwlock01/psxtmrwlock01.doc: Update.

M   1.44  testsuites/psxtmtests/ChangeLog
M    1.2  testsuites/psxtmtests/psxtmrwlock01/init.c
M    1.2  testsuites/psxtmtests/psxtmrwlock01/psxtmrwlock01.doc

diff -u rtems/testsuites/psxtmtests/ChangeLog:1.43 rtems/testsuites/psxtmtests/ChangeLog:1.44
--- rtems/testsuites/psxtmtests/ChangeLog:1.43	Thu Aug  4 10:02:06 2011
+++ rtems/testsuites/psxtmtests/ChangeLog	Thu Aug  4 10:06:45 2011
@@ -1,5 +1,9 @@
 2011-08-04	Ricardo Aguirre <el.mastin at ymail.com>
 
+	* psxtmrwlock01/init.c, psxtmrwlock01/psxtmrwlock01.doc: Update.
+
+2011-08-04	Ricardo Aguirre <el.mastin at ymail.com>
+
 	PR 1881/tests
 	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
 	pthread_rwlock_timedwrlock - not available, blocks.

diff -u rtems/testsuites/psxtmtests/psxtmrwlock01/init.c:1.1 rtems/testsuites/psxtmtests/psxtmrwlock01/init.c:1.2
--- rtems/testsuites/psxtmtests/psxtmrwlock01/init.c:1.1	Tue Aug  2 08:23:33 2011
+++ rtems/testsuites/psxtmtests/psxtmrwlock01/init.c	Thu Aug  4 10:06:45 2011
@@ -12,7 +12,6 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-
 #include <errno.h>
 #include <timesys.h>
 #include <rtems/timerdrv.h>
@@ -40,6 +39,7 @@
     0,
     0
   );
+
 }
 
 void benchmark_pthread_rwlock_rdlock(void)
@@ -59,9 +59,10 @@
     0,
     0
   );
+
 }
 
-void benchmark_pthread_rwlock_unlock(bool do_print)
+void benchmark_pthread_rwlock_unlock(int print)
 {
   long end_time;
   int  status;
@@ -69,12 +70,8 @@
   benchmark_timer_initialize();
     status = pthread_rwlock_unlock(&rwlock);
   end_time = benchmark_timer_read();
-  if ( status == EPERM )
-    puts( "The current thread does not own the read-write lock");
-  else
-    rtems_test_assert( status == 0 );
-
-  if ( do_print ) {
+  rtems_test_assert( status == 0 );
+  if ( print == 1 ){
     put_time(
       "pthread_rwlock_unlock - available",
       end_time,
@@ -93,15 +90,24 @@
   benchmark_timer_initialize();
     status = pthread_rwlock_tryrdlock(&rwlock);
   end_time = benchmark_timer_read();
-  rtems_test_assert( status == 0 );
-
-  put_time(
-    "pthread_rwlock_tryrdlock - available",
-    end_time,
-    1,        /* Only executed once */
-    0,
-    0
-  );
+  rtems_test_assert( status == 0 || status == EBUSY );
+  if (status == EBUSY) {
+    put_time(
+      "pthread_rwlock_tryrdlock - not available",
+      end_time,
+      1,        /* Only executed once */
+      0,
+      0
+    );
+  } else if (status == 0) {
+    put_time(
+      "pthread_rwlock_tryrdlock - available",
+      end_time,
+      1,        /* Only executed once */
+      0,
+      0
+    );
+  }
 }
 
 void benchmark_pthread_rwlock_timedrdlock(void)
@@ -121,6 +127,7 @@
     0,
     0
   );
+
 }
 
 void benchmark_pthread_rwlock_wrlock(void)
@@ -140,6 +147,7 @@
     0,
     0
   );
+
 }
 
 void benchmark_pthread_rwlock_trywrlock(void)
@@ -150,15 +158,25 @@
   benchmark_timer_initialize();
     status = pthread_rwlock_trywrlock(&rwlock);
   end_time = benchmark_timer_read();
-  rtems_test_assert( status == 0 );
 
-  put_time(
-    "pthread_rwlock_trywrlock - available",
-    end_time,
-    1,        /* Only executed once */
-    0,
-    0
-  );
+  rtems_test_assert( status == 0 || status == EBUSY );
+  if ( status == EBUSY ) {
+    put_time(
+      "pthread_rwlock_trywrlock - not available ",
+      end_time,
+      1,        /* Only executed once */
+      0,
+      0
+    );
+  } else if ( status == 0 ) {
+    put_time(
+      "pthread_rwlock_trywrlock - available",
+      end_time,
+      1,        /* Only executed once */
+      0,
+      0
+    );
+  }
 }
 
 void benchmark_pthread_rwlock_timedwrlock(void)
@@ -211,31 +229,36 @@
   /* applying a read lock */
   benchmark_pthread_rwlock_rdlock();
   /* unlocking rwlock */
-  benchmark_pthread_rwlock_unlock( true );
-  /* trying to apply a read lock when it is available */
+  benchmark_pthread_rwlock_unlock(0);
+  /* trying to apply a read lock when it is available*/
   benchmark_pthread_rwlock_tryrdlock();
   /* unlocking rwlock */
-  benchmark_pthread_rwlock_unlock( false );
+  benchmark_pthread_rwlock_unlock(0);
   /* applying a timed read lock */
   benchmark_pthread_rwlock_timedrdlock();
   /* unlocking rwlock */
-  benchmark_pthread_rwlock_unlock( false );
+  benchmark_pthread_rwlock_unlock(0);
   /* applying a write lock */
   benchmark_pthread_rwlock_wrlock();
+  /* trying to get read lock, when is not available*/
+  benchmark_pthread_rwlock_tryrdlock();
   /* unlocking rwlock */
-  benchmark_pthread_rwlock_unlock( false );
-  /* trying to apply a write lock, when it is available */
+  benchmark_pthread_rwlock_unlock(0);
+  /* trying to apply a write lock, when it is available*/
+  benchmark_pthread_rwlock_trywrlock();
+  /* trying to get write lock, when it is not available*/
   benchmark_pthread_rwlock_trywrlock();
   /* unlocking rwlock */
-  benchmark_pthread_rwlock_unlock( false );
+  benchmark_pthread_rwlock_unlock(0);
   /* applying a timed write lock */
   benchmark_pthread_rwlock_timedwrlock();
   /* unlocking rwlock */
-  benchmark_pthread_rwlock_unlock( false );
+  benchmark_pthread_rwlock_unlock(1);
   /* destroying rwlock */
   benchmark_pthread_rwlock_destroy();
 
   puts( "*** END OF POSIX TIME PSXTMRWLOCK 01 ***" );
+
   rtems_test_exit(0);
 }
 

diff -u rtems/testsuites/psxtmtests/psxtmrwlock01/psxtmrwlock01.doc:1.1 rtems/testsuites/psxtmtests/psxtmrwlock01/psxtmrwlock01.doc:1.2
--- rtems/testsuites/psxtmtests/psxtmrwlock01/psxtmrwlock01.doc:1.1	Tue Aug  2 08:23:33 2011
+++ rtems/testsuites/psxtmtests/psxtmrwlock01/psxtmrwlock01.doc	Thu Aug  4 10:06:45 2011
@@ -15,9 +15,10 @@
 + pthread_rwlock_rdlock - available 
 + pthread_rwlock_unlock
 + pthread_rwlock_tryrdlock - available 
++ pthread_rwlock_tryrdlock - not available
 + pthread_rwlock_timedrdlock - available 
-+ pthread_rwlock_wrlock - available 
-+ pthread_rwlock_trywrlock - available 
++ pthread_rwlock_wrlock - available
++ pthread_rwlock_trywrlock - available
++ pthread_rwlock_trywrlock - not available 
 + pthread_rwlock_timedwrlock - available 
 + pthread_rwlock_destroy 
-



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110804/afda9b65/attachment.html>


More information about the vc mailing list