Changeset c1a9c86

Timestamp:

Nov 2, 2017, 5:59:12 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

59a0bde

Parents:

513daec

Message:

Used fast_int in more data structure and started using tuple assign

Location:

src/libcfa/concurrency

Files:

• invoke.h (modified) (5 diffs)
• monitor (modified) (6 diffs)
• monitor.c (modified) (4 diffs)

src/libcfa/concurrency/invoke.h

@@ -66 +66 @@
         struct coStack_t {
                 // size of stack
-                unsigned int size;
+                size_t size;
 
                 // pointer to stack
@@ -85 +85 @@
                 // whether or not the user allocated the stack
                 bool userStack;
-
         };
 
@@ -118 +117 @@
 
                 // number of acceptable functions
-                short size;
+                __lock_size_t size;
         };
 
@@ -149 +148 @@
 
                 // number of currently held monitors
-                short                  size;
+                __lock_size_t size;
 
                 // last function that acquired monitors
-                fptr_t                 func;
+                fptr_t func;
         };
 
@@ -168 +167 @@
                 // monitors currently held by this thread
                 struct __monitor_group_t monitors;
-
 
                 // Link lists fields

src/libcfa/concurrency/monitor

@@ -43 +43 @@
         int count;
         monitor_desc ** prev_mntrs;
-        unsigned short  prev_count;
+        __lock_size_t   prev_count;
         fptr_t          prev_func;
 };
@@ -53 +53 @@
         monitor_desc * m;
         monitor_desc ** prev_mntrs;
-        unsigned short  prev_count;
+        __lock_size_t   prev_count;
         fptr_t          prev_func;
 };
@@ -81 +81 @@
         // Intrusive linked list Next field
         __condition_criterion_t * next;
-
 };
 
@@ -92 +91 @@
 
         // Number of criterions in the criteria
-        unsigned short count;
+        __lock_size_t count;
 
         // Intrusive linked list Next field
@@ -99 +98 @@
         // Custom user info accessible before signalling
         uintptr_t user_info;
-
 };
 
@@ -123 +121 @@
 
         // Number of monitors in the array
-        unsigned short monitor_count;
-
+        __lock_size_t monitor_count;
 };
 

src/libcfa/concurrency/monitor.c

@@ -296 +296 @@
 
         // Save previous thread context
-        this.prev_mntrs = this_thread->monitors.list;
-        this.prev_count = this_thread->monitors.size;
-        this.prev_func  = this_thread->monitors.func;
+        this.[prev_mntrs, prev_count, prev_func] = this_thread->monitors.[list, size, func];
 
         // Update thread context (needed for conditions)
-        this_thread->monitors.list = m;
-        this_thread->monitors.size = count;
-        this_thread->monitors.func = func;
+        this_thread->monitors.[list, size, func] = [m, count, func];
 
         // LIB_DEBUG_PRINT_SAFE("MGUARD : enter %d\n", count);
@@ -325 +321 @@
 
         // Restore thread context
-        this_thread->monitors.list = this.prev_mntrs;
-        this_thread->monitors.size = this.prev_count;
-        this_thread->monitors.func = this.prev_func;
+        this_thread->monitors.[list, size, func] = this.[prev_mntrs, prev_count, prev_func];
 }
 
@@ -337 +331 @@
 
         // Save previous thread context
-        this.prev_mntrs = this_thread->monitors.list;
-        this.prev_count = this_thread->monitors.size;
-        this.prev_func  = this_thread->monitors.func;
+        this.[prev_mntrs, prev_count, prev_func] = this_thread->monitors.[list, size, func];
 
         // Update thread context (needed for conditions)
-        this_thread->monitors.list = m;
-        this_thread->monitors.size = 1;
-        this_thread->monitors.func = func;
+        this_thread->monitors.[list, size, func] = [m, 1, func];
 
         __enter_monitor_dtor( this.m, func );
@@ -355 +345 @@
 
         // Restore thread context
-        this_thread->monitors.list = this.prev_mntrs;
-        this_thread->monitors.size = this.prev_count;
-        this_thread->monitors.func = this.prev_func;
+        this_thread->monitors.[list, size, func] = this.[prev_mntrs, prev_count, prev_func];
 }