Changeset 23578

Timestamp:

2008-03-27 15:48:06 (7 months ago)

Author:

zarzycki@…

Message:

Last minute changes.

Location:

trunk/launchd/src

Files:

• libvproc.c (modified) (5 diffs)
• libvproc_private.h (modified) (1 diff)

trunk/launchd/src/libvproc.c

@@ -93 +93 @@
 _basic_vproc_transaction_begin(void)
 {
-        int64_t newval;
+        typeof(vproc_shmem->vp_shmem_transaction_cnt) newval;
 
         if (unlikely(vproc_shmem == NULL)) {
@@ -115 +115 @@
 }
 
+size_t
+_basic_vproc_transaction_count(void)
+{
+        return likely(vproc_shmem) ? vproc_shmem->vp_shmem_transaction_cnt : INT32_MAX;
+}
+
+void
+_basic_vproc_transaction_try_exit(int status)
+{
+        typeof(vproc_shmem->vp_shmem_transaction_cnt) newval;
+
+        if (unlikely(vproc_shmem == NULL)) {
+                return;
+        }
+
+        vproc_shmem->vp_shmem_flags |= VPROC_SHMEM_EXITING;
+
+        newval = __sync_sub_and_fetch(&vproc_shmem->vp_shmem_transaction_cnt, 1);
+
+        if (newval < 0) {
+                _exit(status);
+        }
+}
+
 void
 vproc_transaction_end(vproc_t vp __attribute__((unused)), vproc_transaction_t vpt)
@@ -129 +153 @@
 _basic_vproc_transaction_end(void)
 {
-        int32_t newval = __sync_sub_and_fetch(&vproc_shmem->vp_shmem_transaction_cnt, 1);
+        typeof(vproc_shmem->vp_shmem_transaction_cnt) newval;
+
+        newval = __sync_sub_and_fetch(&vproc_shmem->vp_shmem_transaction_cnt, 1);
 
         if (unlikely(newval < 0)) {
@@ -146 +172 @@
 {
         vproc_standby_t vpsb = (vproc_standby_t)vproc_shmem_init; /* we need a "random" variable that is testable */
-        int64_t newval;
+        typeof(vproc_shmem->vp_shmem_standby_cnt) newval;
 
         if (unlikely(vproc_shmem == NULL)) {
@@ -168 +194 @@
 vproc_standby_end(vproc_t vp __attribute__((unused)), vproc_standby_t vpt)
 {
-        int32_t newval;
+        typeof(vproc_shmem->vp_shmem_standby_cnt) newval;
 
         if (unlikely(vpt != (vproc_standby_t)vproc_shmem_init)) {

trunk/launchd/src/libvproc_private.h

@@ -79 +79 @@
 void _basic_vproc_transaction_begin(void);
 void _basic_vproc_transaction_end(void);
+size_t _basic_vproc_transaction_count(void);
+void _basic_vproc_transaction_try_exit(int status);
+
 
 #pragma GCC visibility pop