Changeset 23577

Timestamp:

2008-03-27 14:57:51 (5 months ago)

Author:

zarzycki@…

Message:

Refinements.

Location:

trunk/launchd/src

Files:

• launchd_core_logic.c (modified) (2 diffs)
• libvproc.c (modified) (3 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -2232 +2232 @@
         if (j->shmem) {
                 job_assumes(j, munmap(j->shmem, getpagesize()) == 0);
+                j->shmem = NULL;
         }
 
@@ -5447 +5448 @@
         }
 
+        if (unlikely(j->shmem)) {
+                job_log(j, LOG_ERR, "Tried to setup shared memory more than once");
+                return BOOTSTRAP_NOT_PRIVILEGED;
+        }
+
         size_of_page_orig = size_of_page = getpagesize();
 

trunk/launchd/src/libvproc.c

@@ -55 +55 @@
 static int64_t cached_pid = -1;
 static struct vproc_shmem_s *vproc_shmem;
+static pthread_once_t shmem_inited = PTHREAD_ONCE_INIT;
 
 static void
@@ -95 +96 @@
 
         if (unlikely(vproc_shmem == NULL)) {
-                vproc_shmem_init();
-                if (vproc_shmem == NULL) {
+                int po_r = pthread_once(&shmem_inited, vproc_shmem_init);
+                if (po_r != 0 || vproc_shmem == NULL) {
                         return;
                 }
@@ -148 +149 @@
 
         if (unlikely(vproc_shmem == NULL)) {
-                vproc_shmem_init();
-                if (vproc_shmem == NULL) {
+                int po_r = pthread_once(&shmem_inited, vproc_shmem_init);
+                if (po_r != 0 || vproc_shmem == NULL) {
                         return NULL;
                 }