Changeset 788

Timestamp:

Oct 12, 2016, 3:47:26 PM (8 years ago)

Author:

knut

Message:

Implemented support for PHP 7: The Zend API for PHP 7/PHPNG is substantially different from older versions. Therefore, an alternative implementation of zoo_php_support is provided in the new source file service_internal_php7.c. Presently the Zoo kernel can be built with support for either PHP 7 or older versions, see the makefiles (for Windows) nmake.opt and makefile.vc. Other makefiles have not been updated.

Fixed problem with ambiguous symbol in service_conf.y. Fixed problem with conversion of line endings yielding extra bytes in _getStatusFile on Windows platforms. Removed call to free() stack memory in zoo_service_loader.c. Fixed issue with size of structs in service.h.

Location:

trunk/zoo-project

Files:

• zoo-kernel/makefile.vc (modified) (1 diff)
• zoo-kernel/nmake.opt (modified) (2 diffs)
• zoo-kernel/response_print.c (modified) (4 diffs)
• zoo-kernel/service.h (modified) (1 diff)
• zoo-kernel/service_conf.y (modified) (2 diffs)
• zoo-kernel/service_internal.c (modified) (4 diffs)
• zoo-kernel/service_internal_php7.c (added)
• zoo-kernel/zoo_service_loader.c (modified) (16 diffs)
• zoo-services/utils/status/service.c (modified) (1 diff)

trunk/zoo-project/zoo-kernel/makefile.vc

@@ -88 +88 @@
 service_internal_php.obj: service_internal_php.c service_internal_php.h service.h
         $(CPP) /c $(CFLAGS) $(PHP_CFLAGS) service_internal_php.c
+    
+service_internal_php7.obj: service_internal_php7.c service_internal_php.h service.h
+        $(CPP) /c $(CFLAGS) $(PHP_CFLAGS) service_internal_php7.c    
 
 $(LIBZOO_SERVICE): service_internal.obj service.obj sqlapi.obj

trunk/zoo-project/zoo-kernel/nmake.opt

@@ -10 +10 @@
 #PHP_DIR=C:\php-sdk\phpdev\vc12\x86\php-5.5.10-src
 #PHP_LIB=$(PHP_DIR)\Release_TS\php5embed.lib
+#PHP7_DIR=C:\php-sdk\phpdev\vc14\x64\php-7.0.9-src
 
 #!IF DEFINED(MS_DIR)
@@ -56 +57 @@
 PHP_FILE=service_internal_php.obj
 PHP_CFLAGS=-I$(PHP_SRC) -I$(PHP_SRC)\Zend -I$(PHP_SRC)\TSRM /DPHP_WIN32 /DZEND_WIN32 /DWIN32 /D_USE_32BIT_TIME_T /DZTS /DUSE_PHP
+!ELSE IFDEF PHP7_DIR
+PHP_LIB=$(PHP7_DIR)\x64\Release_TS\php7embed.lib
+PHP_CURL_LIB=
+PHP_LDFLAGS=$(PHP_LIB) $(PHP_CURL_LIB)
+PHP_FILE=service_internal_php7.obj
+PHP_CFLAGS=-I$(PHP7_DIR) -I$(PHP7_DIR)\Zend -I$(PHP7_DIR)\TSRM /DPHP_WIN32 /DZEND_WIN32 /DWIN32 /DZTS /DUSE_PHP # /D_USE_32BIT_TIME_T
 !ENDIF
 

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

@@ -2347 +2347 @@
 void outputResponse(service* s,maps* request_inputs,maps* request_outputs,
                     map* request_inputs1,int cpid,maps* m,int res){
+                
 #ifdef DEBUG
   dumpMaps(request_inputs);
@@ -2358 +2359 @@
   map* version=getMapFromMaps(m,"main","rversion");
   int vid=getVersionId(version->value);
-
   maps* tmpSess=getMaps(m,"senv");
   if(tmpSess!=NULL){
@@ -2402 +2402 @@
     }
   }
-  
+                 
   if(res==SERVICE_FAILED){
     map *lenv;
@@ -2429 +2429 @@
     return;
   }
-
+        
   map *tmp1=getMapFromMaps(m,"main","tmpPath");
   if(asRaw==0){

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

@@ -143 +143 @@
  * The memory size to create a map
  */
-#define MAP_SIZE (2*sizeof(char*))+sizeof(NULL)
+//#define MAP_SIZE (2*sizeof(char*))+sizeof(NULL) // knut: size of NULL pointer may be different from regular pointer (platform dependent)
+#define MAP_SIZE (2*sizeof(char*))+sizeof(map*)
 /**
  * The memory size to create an iotype
  */
-#define IOTYPE_SIZE MAP_SIZE+sizeof(NULL)
+//#define IOTYPE_SIZE MAP_SIZE+sizeof(NULL)
+#define IOTYPE_SIZE sizeof(map*) + sizeof(iotype*)
 /**
  * The memory size to create a maps
  */
-#define MAPS_SIZE (2*sizeof(char*))+sizeof(map*)+MAP_SIZE
+//#define MAPS_SIZE (2*sizeof(char*))+sizeof(map*)+MAP_SIZE
+#define MAPS_SIZE sizeof(char*)+sizeof(map*)+sizeof(maps*)
 /**
  * The memory size to create a service
  */
-#define SERVICE_SIZE (ELEMENTS_SIZE*2)+(MAP_SIZE*2)+sizeof(char*)
+//#define SERVICE_SIZE (ELEMENTS_SIZE*2)+(MAP_SIZE*2)+sizeof(char*)
+#define SERVICE_SIZE sizeof(char*) + 2*sizeof(map*) + 2*sizeof(elements*)
 /**
  * The memory size to create a services
  */
-#define SERVICES_SIZE SERVICE_SIZE+sizeof(services*)
+//#define SERVICES_SIZE SERVICE_SIZE+sizeof(services*)
+#define SERVICES_SIZE sizeof(service*)+sizeof(services*)
 /**
  * The memory size to create a registry
  */
-#define REGISTRY_SIZE SERVICES_SIZE+sizeof(char*)
+//#define REGISTRY_SIZE SERVICES_SIZE+sizeof(char*)
+#define REGISTRY_SIZE sizeof(char*)+sizeof(services*)+sizeof(registry*)
 
 #define SHMSZ     27

trunk/zoo-project/zoo-kernel/service_conf.y

@@ -553 +553 @@
   fprintf(stderr,"processid (%s %d) %s\n",__FILE__,__LINE__,$1);
 #endif
-  if(data==-1){
-    data=1;
+//  if(data==-1){
+//    data=1;
+  if(::data==-1){ // knut: add namespace to avoid ambiguous symbol
+    ::data=1;   
     if($1!=NULL){
       char *cen=zStrdup($1);
@@ -795 +797 @@
   wait_outputs=-1;
   wait_data=false;
-  data=-1;
+//data=-1;
+  ::data=-1; // knut: add namespace to avoid ambiguous symbol
   previous_data=1;
   current_data=0;

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

@@ -147 +147 @@
     }
 
-    FILE* f0 = fopen (fileName, "r");
+    //FILE* f0 = fopen (fileName, "r");
+        // knut: open file in binary mode to avoid conversion of line endings (yielding extra bytes) on Windows platforms
+        FILE* f0 = fopen(fileName, "rb"); 
     if(f0!=NULL){
       fseek (f0, 0, SEEK_END);
@@ -260 +262 @@
  */
 int _updateStatus(maps *conf){
+        
   map* r_inputs = getMapFromMaps (conf, "main", "tmpPath");
   map* sid = getMapFromMaps (conf, "lenv", "usid");
+  
   char* fbkpid =
     (char *)
@@ -272 +276 @@
      strlen(status->value)>0 && strlen(msg->value)>1){    
     semid lockid = NULL;
+        
     char* stat=getStatusId(conf,sid->value);
     if(stat!=NULL){
@@ -291 +296 @@
     }
   }
+
   return 0;
 }

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

@@ -22 +22 @@
  * THE SOFTWARE.
  */
-
+ 
 extern "C" int yylex ();
 extern "C" int crlex ();
@@ -104 +104 @@
 extern char **environ;
 #endif
+
 
 #ifdef WIN32
@@ -668 +669 @@
       *eres =
         zoo_php_support (&m, request_inputs, s1, &request_input_real_format,
-                         &request_output_real_format);
+                         &request_output_real_format);          
     }
   else
@@ -890 +891 @@
 runRequest (map ** inputs)
 {
-
+ 
 #ifndef USE_GDB
 #ifndef WIN32
@@ -940 +941 @@
 #endif
 #endif
+
   if (conf_read (conf_file, m) == 2)
     {
@@ -1621 +1623 @@
     return 0;
   }
-  
   s1 = NULL;
   s1 = (service *) malloc (SERVICE_SIZE);
@@ -1995 +1996 @@
   dumpMap (request_inputs);
 #endif
-
   int ei = 1;
   char *s = 
@@ -2046 +2046 @@
   }
 #endif
+
   char *fbkp, *fbkpid, *fbkpres, *fbkp1, *flog;
   FILE *f0, *f1;
@@ -2068 +2069 @@
         return -1;
       }
-
       loadServiceAndRun (&m, s1, request_inputs, &request_input_real_format,
                          &request_output_real_format, &eres);
@@ -2124 +2124 @@
             (char *)
             malloc ((strlen (r_inputs->value) +
-                     strlen (usid->value) + 7) * sizeof (char));
+                     strlen (usid->value) + 7) * sizeof (char));                    
           sprintf (fbkpres, "%s/%s.res", r_inputs->value, usid->value);
           bmap = (maps *) malloc (MAPS_SIZE);
@@ -2258 +2258 @@
   dumpMaps (request_output_real_format);
 #endif
+
   if (eres != -1)
     outputResponse (s1, request_input_real_format,
@@ -2263 +2264 @@
                     cpid, m, eres);
   fflush (stdout);
-  
+
   /**
    * Ensure that if error occurs when freeing memory, no signal will return
@@ -2277 +2278 @@
   signal (SIGABRT, donothing);
 #endif
-  
+
   if (((int) getpid ()) != cpid || cgiSid != NULL)
     {
@@ -2288 +2289 @@
       if(dumpBackFinalFile(m,fbkp,fbkp1)<0)
         return -1;
-
       unlink (fbkpid);
       switch(eres){
@@ -2300 +2300 @@
         setMapInMaps(m,"lenv","fstate",wpsStatus[0]);
         break;
-      }
+      }      
 #ifndef RELY_ON_DB
       dumpMapsToFile(bmap,fbkpres,1);
@@ -2313 +2313 @@
       unhandleStatus (m);
       free(fbkpid);
-      free(fbkpres);
-      free (flog);
+      free(fbkpres); 
+      free (flog);           
       free (fbkp1);
-      free (tmps1);
+      // free (tmps1); // tmps1 is stack memory and should not be freed
       if(cgiSid!=NULL)
         free(cgiSid);

trunk/zoo-project/zoo-services/utils/status/service.c

@@ -22 +22 @@
  * THE SOFTWARE.
  */
+
 
 #include "service.h"