Changeset 680 for trunk/zoo-project/zoo-kernel/service_internal.c

Timestamp:

Jun 24, 2015, 1:58:17 AM (8 years ago)

Author:

djay

Message:

Various fixes for Windows support: generate uuid using UuidCreate?, pass usid to the created process, call TerminateProcess? on dismiss request.

File:

• trunk/zoo-project/zoo-kernel/service_internal.c (modified) (8 diffs)

trunk/zoo-project/zoo-kernel/service_internal.c

@@ -23 +23 @@
  */
 
-#include "fcgi_stdio.h"
 #include "service_internal.h"
 #ifdef USE_MS
@@ -90 +89 @@
      ){
 #ifdef WIN32
-    return NULL
+    return NULL;
 #else
     return -1;
@@ -96 +95 @@
   }
   if(lockShm(lockid)<0){
+#ifdef WIN32
+      return NULL;
+#else
     if(itn<ZOO_LOCK_MAX_RETRY){
       itn++;
       goto toRetry1;
     }else
-#ifdef WIN32
-    return NULL
-#else
-    return -1;
+      return -1;
 #endif
   }else
@@ -211 +210 @@
       free(fbkpid);
       if(stat!=NULL){
+#ifndef WIN32
         removeShmLock(conf,1);
+#else
+        unlockShm(lockid);
+#endif
         free(stat);
       }
@@ -271 +274 @@
     if(stat!=NULL){
       lockid=acquireLock(conf);
-      if(lockid<0)
+      if(lockid<0){
+        dumpMap(status);
         return ZOO_LOCK_ACQUIRE_FAILED;
+      }
     }
     FILE* fstatus=fopen(fbkpid,"w");
@@ -292 +297 @@
 #ifdef WIN32
 
-#include <windows.h>
-#include <fcgi_stdio.h>
-#include <stdio.h>
-#include <conio.h>
-#include <tchar.h>
-
 #define SHMEMSIZE 4096
 
@@ -308 +307 @@
   map *tmpMap=getMapFromMaps(conf,"lenv","lid");
   if(tmpMap==NULL)
-        tmpMap=getMapFromMaps(conf,"lenv","osid");
+    tmpMap=getMapFromMaps(conf,"lenv","osid");
 
   if(tmpMap!=NULL){
-        snprintf(key, length, "zoo_sem_%s", tmpMap->value);      
+    snprintf(key, length, "zoo_sem_%s", tmpMap->value);      
   }
   else {
-        strncpy(key, "-1", length);  
+    strncpy(key, "-1", length);
   }
   return strlen(key);
@@ -321 +320 @@
 
 semid getShmLockId(maps* conf, int nsems){
-    semid sem_id;
-    char key[MAX_PATH];
-    getKeyValue(conf, key, MAX_PATH);
-    
-    sem_id = CreateSemaphore( NULL, nsems, nsems+1, key);
-    if(sem_id==NULL){
-#ifdef DEBUG
-      fprintf(stderr,"Semaphore failed to create: %s\n", getLastErrorMessage());
-#endif
-      return NULL;
-    }
-#ifdef DEBUG
-    fprintf(stderr,"%s Accessed !\n",key);
-#endif
-
-    return sem_id;
+  semid sem_id;
+  char key[MAX_PATH];
+  getKeyValue(conf, key, MAX_PATH);
+  
+  sem_id = CreateSemaphore( NULL, nsems, nsems+1, key);
+  if(sem_id==NULL){
+#ifdef DEBUG
+    fprintf(stderr,"Semaphore failed to create: %s\n", getLastErrorMessage());
+#endif
+    return NULL;
+  }
+#ifdef DEBUG
+  fprintf(stderr,"%s Accessed !\n",key);
+#endif
+  return sem_id;
 }