Changeset 0319a8f6 in mainline

Timestamp:

2006-04-05T12:10:53Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a7818c26

Parents:

8fe1cdb

Message:

Sync uspace.
Fix comment in futex.c.

Files:

• init/init.c (modified) (5 diffs)
• libc/generic/futex.c (modified) (2 diffs)

init/init.c

@@ -40 +40 @@
 atomic_t ftx;
 
-int __thread tls_prom;
+int __thread stage;
 
 extern void utest(void *arg);
@@ -258 +258 @@
 static int ptest(void *arg)
 {
-        tls_prom = -1;
-        printf("Pseudo thread stage%d.\n", -tls_prom);
-        tls_prom = -2;
+        stage = 1;
+        printf("Pseudo thread stage%d.\n", stage);
+        stage++;
         psthread_schedule_next();
-        printf("Pseudo thread stage%d.\n", -tls_prom);
-        tls_prom = -3;
+        printf("Pseudo thread stage%d.\n", stage);
+        stage++;
         psthread_schedule_next();
-        printf("Pseudo thread stage%d\n", -tls_prom);
+        printf("Pseudo thread stage%d.\n", stage);
         psthread_schedule_next();
-        printf("Pseudo thread stage4.\n");
+        stage++;
+        printf("Pseudo thread stage%d.\n", stage);
         psthread_schedule_next();
         printf("Pseudo thread exiting.\n");
@@ -296 +297 @@
         if (futex_down(&ftx) < 0)
                 printf("Futex failed.\n");
-/*
+
         if ((tid = thread_create(utest, NULL, "utest")) != -1) {
                 printf("Created thread tid=%d\n", tid);
@@ -304 +305 @@
                 printf("Created thread tid=%d\n", tid);
         }
-*/
+
         int i;
         
@@ -314 +315 @@
 
 
-        printf("Creating pathread\n");
-        tls_prom = 1;
+        printf("Creating pseudo thread.\n");
+        stage = 1;
         ptid = psthread_create(ptest, NULL);
-        printf("Main thread stage%d\n",tls_prom);
-        tls_prom = 2;
+        printf("Main thread stage%d.\n", stage);
+        stage++;
         psthread_schedule_next();;
-        printf("Main thread stage%d\n", tls_prom);
-        tls_prom = 3;
+        printf("Main thread stage%d.\n", stage);
+        stage++;
         psthread_schedule_next();;
-        printf("Main thread stage%d\n", tls_prom);
+        printf("Main thread stage%d.\n", stage);
 
         psthread_join(ptid);

libc/generic/futex.c

@@ -39 +39 @@
  * counter and the futex wait queue, there is a race condition:
  *
- * wq->missed_wakeups == 1 && futex->count = 1
+ * (wq->missed_wakeups == 1) && (futex->count = 1)
  *
  * Scenario 1 (wait queue timeout vs. futex_up()):
@@ -155 +155 @@
  * @param futex Futex.
  *
- * @return ENOENT if there is no such virtual address or futex. Otherwise zero.
+ * @return ENOENT if there is no such virtual address. Otherwise zero.
  */
 int futex_up(atomic_t *futex)