Changeset 554

Timestamp:

Feb 5, 2015, 7:17:31 PM (10 years ago)

Author:

knut

Message:

Changed the WIN32 version of function zGettimeofday. Changed return type for getShmLockId (WIN32). Changed type of _HINTERNET.mimeType from unsigned char* to char*. Fixed interconnected memory issues in functions getKeyValue and getShmLockId (WIN32). Added code to transfer the correct unique process identifier (usid) to background processes (applies to WIN32 version).

Location:

trunk/zoo-project/zoo-kernel

Files:

• service.h (modified) (1 diff)
• service_internal.c (modified) (3 diffs)
• ulinet.h (modified) (1 diff)
• zoo_loader.c (modified) (1 diff)
• zoo_service_loader.c (modified) (4 diffs)

trunk/zoo-project/zoo-kernel/service.h

@@ -46 +46 @@
   long tv_usec; /* and microseconds */
 };
-void zGettimeofday(struct mstimeval* tp, void* tzp)
+static int zGettimeofday(struct ztimeval* tp, void* tzp)
 {
+  if (tp == 0) {
+    return -1;
+  }
+  
   struct _timeb theTime;
   _ftime(&theTime);
   tp->tv_sec = theTime.time;
   tp->tv_usec = theTime.millitm * 1000;
+  
+  return 0; // The gettimeofday() function shall return 0 on success
 }
 #else

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

@@ -124 +124 @@
 #define SHMEMSIZE 4096
 
-char* getKeyValue(maps* conf){
-  if(conf==NULL)
-     return "700666";
+size_t getKeyValue(maps* conf, char* key, size_t length){
+  
+  if(conf==NULL) {
+         strncpy(key, "700666", length);
+         return strlen(key);
+  }
+  
   map *tmpMap=getMapFromMaps(conf,"lenv","lid");
   if(tmpMap==NULL)
-    tmpMap=getMapFromMaps(conf,"lenv","usid");
-  char* key="-1";
+        tmpMap=getMapFromMaps(conf,"lenv","usid");
+
   if(tmpMap!=NULL){
-    key=(char*)malloc((strlen(tmpMap->value)+9)*sizeof(char));
-    sprintf(key,"zoo_sem_%s",tmpMap->value);
-  }
-  return key;
-}
-
-
+        snprintf(key, length, "zoo_sem_%s", tmpMap->value);      
+  }
+  else {
+        strncpy(key, "-1", length);  
+  }
+  return strlen(key);
+} 
 semid getShmLockId(maps* conf, int nsems){
     semid sem_id;
-    char* key=getKeyValue(conf);
+        char key[MAX_PATH];
+        getKeyValue(conf, key, MAX_PATH);
     
     sem_id = CreateSemaphore( NULL, nsems, nsems+1, key);
     if(sem_id==NULL){
-      if(strncmp(key,"-1",2)!=0)
-        free(key);
+
 #ifdef DEBUG
       fprintf(stderr,"Semaphore failed to create ! %s\n",GetLastError());
@@ -155 +159 @@
     fprintf(stderr,"%s Accessed !\n",key);
 #endif
-    if(strncmp(key,"-1",2)!=0)
-      free(key);
+
     return sem_id;
 }
@@ -3335 +3338 @@
               mimeType=strdup("none");
             else
-              mimeType=strdup((char*)hInternet->ihandle[index].mimeType);
+                  mimeType=strdup(hInternet->ihandle[index].mimeType);        
             
             map* tmpMap=getMapOrFill(&content->content,vname,"");

trunk/zoo-project/zoo-kernel/ulinet.h

@@ -80 +80 @@
   size_t size;
   unsigned char *pabyData;
-  unsigned char *mimeType;
+  char *mimeType;
   int hasCacheFile;
   int nDataLen;

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

@@ -37 +37 @@
 #include <unistd.h>
 #include "service_internal.h"
+
+
 #ifdef WIN32
 #include "windows.h"

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

@@ -781 +781 @@
   fprintf (stderr, "REQUEST IS : %s \n", tmp);
 #endif
+
+  map* usid = getMapFromMaps (m, "lenv", "usid");
+  if (usid != NULL && usid->value != NULL) {
+    SetEnvironmentVariable("USID", TEXT (usid->value));
+  }
+
   SetEnvironmentVariable ("CGISID", TEXT (sid->value));
   SetEnvironmentVariable ("QUERY_STRING", TEXT (tmpq));
@@ -824 +830 @@
 
 #ifndef USE_GDB
+#ifndef WIN32
   signal (SIGCHLD, SIG_IGN);
+#endif  
   signal (SIGSEGV, sig_handler);
   signal (SIGTERM, sig_handler);
@@ -3203 +3211 @@
   _tmpMaps->name = zStrdup ("lenv");
   char tmpBuff[100];
-  int lid = getShmLockId (NULL, 1);
+  semid lid = getShmLockId (NULL, 1);
   lockShm (lid);
   struct ztimeval tp;
@@ -3307 +3315 @@
   if (getenv ("CGISID") != NULL)
     addToMap (request_inputs, "cgiSid", getenv ("CGISID"));
+
+  char* usidp;
+  if ( (usidp = getenv("USID")) != NULL ) {
+    setMapInMaps (m, "lenv", "usid", usidp);
+  }
+
   map *test1 = getMap (request_inputs, "cgiSid");
   if (test1 != NULL)