Changeset 578

Timestamp:

Feb 12, 2015, 12:35:20 PM (10 years ago)

Author:

knut

Message:

Added function getLastErrorMessage() (service_internal.c). Fixed problems caused by differing return types for GetLastError?() (unsigned int) and dlerror() (char*). Added DEBUG-conditional macros for diagnostic output in zoo_service_loader.c.

Location:

trunk/zoo-project/zoo-kernel

Files:

• service_internal.c (modified) (7 diffs)
• service_internal.h (modified) (1 diff)
• zoo_service_loader.c (modified) (8 diffs)

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

@@ -37 +37 @@
 #endif
 
+#ifndef WIN32
+#include <dlfcn.h>
+#endif
+
+#define ERROR_MSG_MAX_LENGTH 1024
+
 int isValidLang(maps* conf,const char *str){
   map *tmpMap=getMapFromMaps(conf,"main","lang");
@@ -152 +158 @@
 
 #ifdef DEBUG
-      fprintf(stderr,"Semaphore failed to create ! %s\n",GetLastError());
+      fprintf(stderr,"Semaphore failed to create: %s\n", getLastErrorMessage());
 #endif
       return NULL;
@@ -166 +172 @@
   semid sem_id=getShmLockId(conf,1);
   if (CloseHandle(sem_id) == 0) {
-    fprintf(stderr,"Unable to remove semaphore %s",GetLastError());
+    fprintf(stderr,"Unable to remove semaphore: %s\n", getLastErrorMessage());
     return -1;
   }
@@ -232 +238 @@
   if (hMapObjectG == NULL){
 #ifdef DEBUG
-    fprintf(stderr,"Unable to create shared memory segment %d !! \n",GetLastError());
+    fprintf(stderr,"Unable to create shared memory segment: %s\n", getLastErrorMessage());
 #endif
     return -2;
@@ -292 +298 @@
 #ifdef DEBUG
     fprintf(stderr,"ERROR on line %d\n",__LINE__);
-    fprintf(stderr,"READING STRING S %s\n",GetLastError());
+    fprintf(stderr,"READING STRING S %s\n", getLastErrorMessage());
 #endif
     fIgnore = UnmapViewOfFile(lpvMem); 
@@ -309 +315 @@
 #ifdef DEBUG
     fprintf(stderr,"READING STRING S %d\n",__LINE__);
-    fprintf(stderr,"READING STRING S %s\n",GetLastError());
+    fprintf(stderr,"READING STRING S %s\n", getLastErrorMessage());
 #endif
     return "-1"; 
@@ -3733 +3739 @@
   }
 }
+
+/* 
+ * The character string returned from getLastErrorMessage resides
+ * in a static buffer. The application should not write to this
+ * buffer or attempt to free() it.
+ */ 
+char* getLastErrorMessage() {                                                                                                                                                    
+#ifdef WIN32    
+        LPVOID lpMsgBuf;
+        DWORD errCode = GetLastError();
+        static char msg[ERROR_MSG_MAX_LENGTH];
+        size_t i;
+
+        DWORD length = FormatMessage(
+                                         FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+                                         FORMAT_MESSAGE_FROM_SYSTEM |
+                                         FORMAT_MESSAGE_IGNORE_INSERTS,
+                                         NULL,
+                                         errCode,
+                                         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                                         (LPTSTR) &lpMsgBuf,
+                                         0, NULL );     
+        
+        #ifdef UNICODE          
+                wcstombs_s( &i, msg, ERROR_MSG_MAX_LENGTH,
+                                        (wchar_t*) lpMsgBuf, _TRUNCATE );
+        #else
+                strcpy_s( msg, ERROR_MSG_MAX_LENGTH,
+                      (char *) lpMsgBuf );              
+        #endif  
+        LocalFree(lpMsgBuf);
+        
+        return msg;
+#else
+        return dlerror();
+#endif
+}

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

@@ -174 +174 @@
   char* getInputValue( maps*,const char*,size_t*);
   int  setOutputValue( maps*, const char*, char*, size_t);
-
+  
+  char* getLastErrorMessage();
 #ifdef __cplusplus
 }

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

@@ -455 +455 @@
 #endif
 #ifdef WIN32
-      DWORD errstr;
-      errstr = GetLastError ();
+      char* errstr = getLastErrorMessage();
 #else
       char *errstr;
@@ -462 +461 @@
 #endif
 #ifdef DEBUG
-      fprintf (stderr, "%s loaded (%d) \n", tmps1, errstr);
+          fprintf (stderr, "%s loaded (%s) \n", tmps1, errstr);
 #endif
       if (so != NULL)
@@ -494 +493 @@
 #ifdef DEBUG
 #ifdef WIN32
-              errstr = GetLastError ();
+                          errstr = getLastErrorMessage();
 #else
               errstr = dlerror ();
@@ -529 +528 @@
 #ifdef DEBUG
 #ifdef WIN32
-              errstr = GetLastError ();
-              fprintf (stderr, "Function %s failed to load because of %d\n",
+                          errstr = getLastErrorMessage();
+              fprintf (stderr, "Function %s failed to load because of %s\n",
                        r_inputs->value, errstr);
 #endif
@@ -549 +548 @@
                 {
 #ifdef WIN32
-                  errstr = GetLastError ();
+                                  errstr = getLastErrorMessage();
 #else
                   errstr = dlerror ();
@@ -571 +570 @@
 #ifdef DEBUG
 #ifdef WIN32
-              errstr = GetLastError ();
+                          errstr = getLastErrorMessage();
 #else
               errstr = dlerror ();
@@ -604 +603 @@
           char tmps[1024];
 #ifdef WIN32
-          DWORD errstr = GetLastError ();
+                  errstr = getLastErrorMessage();
 #else
-          char *errstr = dlerror ();
+              errstr = dlerror ();
 #endif
           sprintf (tmps, _("C Library can't be loaded %s"), errstr);
@@ -2843 +2842 @@
    */
   map* errI=NULL;
+#ifdef DEBUG  
   dumpMaps(request_input_real_format);
+#endif  
   char *dfv = addDefaultValues (&request_input_real_format, s1->inputs, m, 0,&errI);
+#ifdef DEBUG  
   dumpMaps(request_input_real_format);
+#endif  
   maps *ptr = request_input_real_format;
   while (ptr != NULL)