svn merge ^/branches/released .

1 files changed, 132 insertions, 132 deletions

diff --git a/pthreads/tests/once3.c b/pthreads/tests/once3.c
index 981bbf7d8..291f26019 100644
--- a/pthreads/tests/once3.c
+++ b/pthreads/tests/once3.c
@@ -1,132 +1,132 @@
-/*
- * once3.c
- *
- *
- * --------------------------------------------------------------------------
- *
- *      Pthreads-win32 - POSIX Threads Library for Win32
- *      Copyright(C) 1998 John E. Bossom
- *      Copyright(C) 1999,2005 Pthreads-win32 contributors
- * 
- *      Contact Email: rpj@callisto.canberra.edu.au
- * 
- *      The current list of contributors is contained
- *      in the file CONTRIBUTORS included with the source
- *      code distribution. The list can also be seen at the
- *      following World Wide Web location:
- *      http://sources.redhat.com/pthreads-win32/contributors.html
- * 
- *      This library is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU Lesser General Public
- *      License as published by the Free Software Foundation; either
- *      version 2 of the License, or (at your option) any later version.
- * 
- *      This library is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *      Lesser General Public License for more details.
- * 
- *      You should have received a copy of the GNU Lesser General Public
- *      License along with this library in the file COPYING.LIB;
- *      if not, write to the Free Software Foundation, Inc.,
- *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- *
- * --------------------------------------------------------------------------
- *
- * Create several pthread_once objects and channel several threads
- * through each. Make the init_routine cancelable and cancel them with
- * waiters waiting.
- *
- * Depends on API functions:
- *	pthread_once()
- *	pthread_create()
- *      pthread_testcancel()
- *      pthread_cancel()
- *      pthread_once()
- */
-
-#define ASSERT_TRACE
-
-#include "test.h"
-
-#define NUM_THREADS 100 /* Targeting each once control */
-#define NUM_ONCE    10
-
-pthread_once_t o = PTHREAD_ONCE_INIT;
-pthread_once_t once[NUM_ONCE];
-
-typedef struct {
-  int i;
-  CRITICAL_SECTION cs;
-} sharedInt_t;
-
-static sharedInt_t numOnce = {0, {0}};
-static sharedInt_t numThreads = {0, {0}};
-
-void
-myfunc(void)
-{
-  EnterCriticalSection(&numOnce.cs);
-  numOnce.i++;
-  assert(numOnce.i > 0);
-  LeaveCriticalSection(&numOnce.cs);
-  /* Simulate slow once routine so that following threads pile up behind it */
-  Sleep(10);
-  /* test for cancelation late so we're sure to have waiters. */
-  pthread_testcancel();
-}
-
-void *
-mythread(void * arg)
-{
-  /*
-   * Cancel every thread. These threads are deferred cancelable only, so
-   * only the thread performing the once routine (my_func) will see it (there are
-   * no other cancelation points here). The result will be that every thread
-   * eventually cancels only when it becomes the new once thread.
-   */
-  assert(pthread_cancel(pthread_self()) == 0);
-  assert(pthread_once(&once[(int) arg], myfunc) == 0);
-  EnterCriticalSection(&numThreads.cs);
-  numThreads.i++;
-  LeaveCriticalSection(&numThreads.cs);
-  return 0;
-}
-
-int
-main()
-{
-  pthread_t t[NUM_THREADS][NUM_ONCE];
-  int i, j;
-  
-  InitializeCriticalSection(&numThreads.cs);
-  InitializeCriticalSection(&numOnce.cs);
-
-  for (j = 0; j < NUM_ONCE; j++)
-    {
-      once[j] = o;
-
-      for (i = 0; i < NUM_THREADS; i++)
-        {
-          assert(pthread_create(&t[i][j], NULL, mythread, (void *) j) == 0);
-        }
-    }
-
-  for (j = 0; j < NUM_ONCE; j++)
-    for (i = 0; i < NUM_THREADS; i++)
-      if (pthread_join(t[i][j], NULL) != 0)
-        printf("Join failed for [thread,once] = [%d,%d]\n", i, j);
-
-  /*
-   * All threads will cancel, none will return normally from
-   * pthread_once and so numThreads should never be incremented. However,
-   * numOnce should be incremented by every thread (NUM_THREADS*NUM_ONCE).
-   */
-  assert(numOnce.i == NUM_ONCE * NUM_THREADS);
-  assert(numThreads.i == 0);
-
-  DeleteCriticalSection(&numOnce.cs);
-  DeleteCriticalSection(&numThreads.cs);
-
-  return 0;
-}
+/*

+ * once3.c

+ *

+ *

+ * --------------------------------------------------------------------------

+ *

+ *      Pthreads-win32 - POSIX Threads Library for Win32

+ *      Copyright(C) 1998 John E. Bossom

+ *      Copyright(C) 1999,2005 Pthreads-win32 contributors

+ * 

+ *      Contact Email: rpj@callisto.canberra.edu.au

+ * 

+ *      The current list of contributors is contained

+ *      in the file CONTRIBUTORS included with the source

+ *      code distribution. The list can also be seen at the

+ *      following World Wide Web location:

+ *      http://sources.redhat.com/pthreads-win32/contributors.html

+ * 

+ *      This library is free software; you can redistribute it and/or

+ *      modify it under the terms of the GNU Lesser General Public

+ *      License as published by the Free Software Foundation; either

+ *      version 2 of the License, or (at your option) any later version.

+ * 

+ *      This library is distributed in the hope that it will be useful,

+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ *      Lesser General Public License for more details.

+ * 

+ *      You should have received a copy of the GNU Lesser General Public

+ *      License along with this library in the file COPYING.LIB;

+ *      if not, write to the Free Software Foundation, Inc.,

+ *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA

+ *

+ * --------------------------------------------------------------------------

+ *

+ * Create several pthread_once objects and channel several threads

+ * through each. Make the init_routine cancelable and cancel them with

+ * waiters waiting.

+ *

+ * Depends on API functions:

+ *	pthread_once()

+ *	pthread_create()

+ *      pthread_testcancel()

+ *      pthread_cancel()

+ *      pthread_once()

+ */

+

+/* #define ASSERT_TRACE */

+

+#include "test.h"

+

+#define NUM_THREADS 100 /* Targeting each once control */

+#define NUM_ONCE    10

+

+pthread_once_t o = PTHREAD_ONCE_INIT;

+pthread_once_t once[NUM_ONCE];

+

+typedef struct {

+  int i;

+  CRITICAL_SECTION cs;

+} sharedInt_t;

+

+static sharedInt_t numOnce = {0, {0}};

+static sharedInt_t numThreads = {0, {0}};

+

+void

+myfunc(void)

+{

+  EnterCriticalSection(&numOnce.cs);

+  numOnce.i++;

+  assert(numOnce.i > 0);

+  LeaveCriticalSection(&numOnce.cs);

+  /* Simulate slow once routine so that following threads pile up behind it */

+  Sleep(10);

+  /* test for cancelation late so we're sure to have waiters. */

+  pthread_testcancel();

+}

+

+void *

+mythread(void * arg)

+{

+  /*

+   * Cancel every thread. These threads are deferred cancelable only, so

+   * only the thread performing the once routine (my_func) will see it (there are

+   * no other cancelation points here). The result will be that every thread

+   * eventually cancels only when it becomes the new once thread.

+   */

+  assert(pthread_cancel(pthread_self()) == 0);

+  assert(pthread_once(&once[(int) arg], myfunc) == 0);

+  EnterCriticalSection(&numThreads.cs);

+  numThreads.i++;

+  LeaveCriticalSection(&numThreads.cs);

+  return 0;

+}

+

+int

+main()

+{

+  pthread_t t[NUM_THREADS][NUM_ONCE];

+  int i, j;

+  

+  InitializeCriticalSection(&numThreads.cs);

+  InitializeCriticalSection(&numOnce.cs);

+

+  for (j = 0; j < NUM_ONCE; j++)

+    {

+      once[j] = o;

+

+      for (i = 0; i < NUM_THREADS; i++)

+        {

+          assert(pthread_create(&t[i][j], NULL, mythread, (void *) j) == 0);

+        }

+    }

+

+  for (j = 0; j < NUM_ONCE; j++)

+    for (i = 0; i < NUM_THREADS; i++)

+      if (pthread_join(t[i][j], NULL) != 0)

+        printf("Join failed for [thread,once] = [%d,%d]\n", i, j);

+

+  /*

+   * All threads will cancel, none will return normally from

+   * pthread_once and so numThreads should never be incremented. However,

+   * numOnce should be incremented by every thread (NUM_THREADS*NUM_ONCE).

+   */

+  assert(numOnce.i == NUM_ONCE * NUM_THREADS);

+  assert(numThreads.i == 0);

+

+  DeleteCriticalSection(&numOnce.cs);

+  DeleteCriticalSection(&numThreads.cs);

+

+  return 0;

+}