Changeset d60a4c2 for tests/concurrency/pthread

Timestamp:

Jan 11, 2025, 5:48:46 PM (13 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master, stuck-waitfor-destruct

Children:

f886608

Parents:

7d65715f (diff), 32a119e9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests/concurrency/pthread

Files:

• pthread_cond_test.cfa (modified) (3 diffs)
• pthread_once_test.cfa (modified) (1 diff)

tests/concurrency/pthread/pthread_cond_test.cfa

@@ -9 +9 @@
 pthread_cond_t cond;
 
-extern "C"{
-    void* S1(void* arg){
+extern "C" {
+    void* S1( void * ) {
         pthread_mutex_lock(&_mutex);
         for (int i = 0; i < 1000; i++) sout | "S1 done " | i;
@@ -19 +19 @@
     }
 
-    void* S2(void* arg){
+    void* S2( void * ) {
         pthread_mutex_lock(&_mutex);
         if (!done_flag) pthread_cond_wait(&cond, &_mutex);
@@ -30 +30 @@
 
 
-int main(int argc, char const *argv[])
-{
-    /* code */
+int main() {
     pthread_mutex_init(&_mutex, NULL);
     pthread_cond_init(&cond, NULL);

tests/concurrency/pthread/pthread_once_test.cfa

@@ -90 +90 @@
 
 
-int main(int argc, char const *argv[])
+int main()
 {
     test();