Replace #define syscalls cancel machinery.

sysdeps/nacl/futex_emulation.c

 #include <futex_emulation.h>
 
 #include <assert.h>
 #include <errno.h>
 #include <irt_syscalls.h>
 #include <tls.h>
 
 
 static int global_futex_emulation_mutex_desc = -1;
 static LIST_HEAD (waiters_list);
@@ skipping 72 matching lines @@
 
 ret_unlock:
   if (!__nacl_irt_mutex_unlock (global_futex_emulation_mutex_desc))
     retcode = 0;
 ret_no_unlock:
   return retcode;
 }
 
 /* Note: global_futex_emulation_mutex_desc must be taken when called.  */
 static int nacl_futex_wake_nolock (volatile int *addr, int nwake,
-                                   unsigned int bitset)
+                                   unsigned int bitset,
+                                   int *count)
 {
   int retcode = 0;
   list_t *entry;
   list_t *prev;
+  *count = 0;
 
   if (nwake <= 0)
-    return retcode;
+    return 0;
 
   list_for_each_prev_safe (entry, prev, &waiters_list)
     {
       struct thread_wait_list_node *curr;
 
       curr = list_entry (entry, struct thread_wait_list_node, list);
 
       if ((curr->addr == addr) && (curr->bitset & bitset))
         {
           list_del (entry);
           /* Mark the list entry as freed */
           entry->next = NULL;
           /* Cannot really do anything if error happens here.  */
           __nacl_irt_cond_signal (curr->condvar_desc);
-          retcode++;
+          (*count)++;
           nwake--;
           if (nwake <= 0)
-            return retcode;
+            return 0;
         }
     }
 
   return retcode;
 }
 
-int __nacl_futex_wake (volatile int *addr, int nwake, unsigned int bitset)
+int __nacl_futex_wake (volatile int *addr, int nwake, unsigned int bitset,
+                       int *count)
 {
   int retcode = 0;
 
   if (__nacl_irt_mutex_lock (global_futex_emulation_mutex_desc))
     goto ret_no_unlock;
 
-  retcode = nacl_futex_wake_nolock (addr, nwake, bitset);
+  retcode = nacl_futex_wake_nolock (addr, nwake, bitset, count);
 
   /* Cannot really do anything if error happens here.  */
   __nacl_irt_mutex_unlock (global_futex_emulation_mutex_desc);
 ret_no_unlock:
   return retcode;
 }
 
 struct __attribute__ ((__packed__)) decoded_wake_op_operation
   {
     unsigned int compare_argument               :12;
     unsigned int operation_argument             :12;
     unsigned int compare                        :4;
     unsigned int operation                      :3;
     unsigned int operation_argument_shifted     :1;
   };
 
 int __nacl_futex_wake_op (volatile int *addr1, volatile int *addr2,
                           int nwake1, int nwake2,
                           union __attribute__ ((__transparent_union__))
                             {
                               int encoded_futex_operation;
                               struct decoded_wake_op_operation
                                 decoded_wake_op_operation;
-                            } futex_operation)
+                            } futex_operation,
+                          int *count)
 {
   int retcode = 0;
   int operation_argument;
   int old_value;
 
   if (__nacl_irt_mutex_lock (global_futex_emulation_mutex_desc))
     goto ret_no_unlock;
 
   operation_argument =
     futex_operation.decoded_wake_op_operation.operation_argument;
@@ skipping 46 matching lines @@
         break;
       case 5/*FUTEX_OP_CMP_GE*/:
         old_value = old_value
           >= futex_operation.decoded_wake_op_operation.compare_argument;
         break;
       default:
         retcode = -ENOSYS;
         goto ret_unlock;
     }
 
-  retcode = nacl_futex_wake_nolock (addr1, nwake1, __FUTEX_BITSET_MATCH_ANY);
+  retcode = nacl_futex_wake_nolock (addr1, nwake1, __FUTEX_BITSET_MATCH_ANY,
+                                    count);
 
-  if (old_value)
-    retcode += nacl_futex_wake_nolock (addr2, nwake2, __FUTEX_BITSET_MATCH_ANY);
+  if (!retcode && old_value)
+    {
+      int count2;
+      retcode = nacl_futex_wake_nolock (addr2, nwake2, __FUTEX_BITSET_MATCH_ANY,
+                                        &count2);
+      (*count) += count2;
+    }
 
 ret_unlock:
   /* Cannot really do anything if error happens here.  */
   __nacl_irt_mutex_unlock (global_futex_emulation_mutex_desc);
 ret_no_unlock:
   return retcode;
 }
 
 int __nacl_futex_cmp_requeue (volatile int *addr1, volatile int *addr2,
-                              int nwake, int nrequeue, int val)
+                              int nwake, int nrequeue, int val, int *count)
 {
   int retcode = -EINTR;
 
   if (__nacl_irt_mutex_lock (global_futex_emulation_mutex_desc))
     goto ret_no_unlock;
 
   if (*addr1 != val)
     {
       retcode = -EAGAIN;
       goto ret_unlock;
     }
   else
     {
       list_t *entry;
-      retcode = nacl_futex_wake_nolock (addr1, nwake, __FUTEX_BITSET_MATCH_ANY);
+      retcode = nacl_futex_wake_nolock (addr1, nwake, __FUTEX_BITSET_MATCH_ANY, count);

[pasko-google - do not use, 2011/09/02 16:25:24]

line too long

[khim, 2011/09/02 16:36:09]

Done.

 
       if (retcode <= 0 || (waiters_list.next == &waiters_list) || nrequeue <= 0)
         goto ret_unlock_nocheck;
 
       list_for_each_prev (entry, &waiters_list)
         {
           struct thread_wait_list_node *curr;
 
           if (!nrequeue)
             break;
 
           curr = list_entry (entry, struct thread_wait_list_node, list);
 
           if (curr->addr == addr1)
             {
               curr->addr = addr2;
-              retcode++;
+              count++;
               nrequeue--;
             }
         }
 
 ret_unlock_nocheck:
       /* Cannot really do anything if error happens here.  */
       __nacl_irt_mutex_unlock (global_futex_emulation_mutex_desc);
       return retcode;
     }
 
 ret_unlock:
   if (!__nacl_irt_mutex_unlock (global_futex_emulation_mutex_desc))
     retcode = 0;
 ret_no_unlock:
   return retcode;
 }