Fix a bug in the cache manager + Detect when the socket is died and exit the child properly

Benjamin Renard
1 parent ed267e8d
Showing 2 changed files with 36 additions and 0 deletions Show diff stats
src/SERVER/DD_Cache.c
src/SERVER/DD_Server.c
@@ -530,6 +530,20 @@ int Cache_RequestDataFileAccess(DD_Var_t *D, char* dataFileName)
 		Cache_UnlockVI(D->InstrName);
 		if(Verbose)
 			fprintf(stderr,"Cache_RequestDataFileAccess. Not available slot to open data file %s.\n", dataFileName);
+		//Update process lists for all slots
+		for (i = 0; i < CASHLEN; ++i)
+		{
+			cache_data->VIFiles[cacheVIIndex].dataFiles[i].state = CACHE_NOTUSED;
+			for (j = 0; j < CACHE_MAXCLIENT; ++j)
+			{
+				if (cache_data->VIFiles[cacheVIIndex].dataFiles[i].clientPIDS[j] == 0)
+					continue;
+				if (Cache_PIDIsRunning(cache_data->VIFiles[cacheVIIndex].dataFiles[i].clientPIDS[j]) == 0)
+					cache_data->VIFiles[cacheVIIndex].dataFiles[i].clientPIDS[j] = 0;
+				else
+					cache_data->VIFiles[cacheVIIndex].dataFiles[i].state = CACHE_USED;
+			}
+		}
 		//Retry
 		//sleep(2);
 		return Cache_RequestDataFileAccess(D, dataFileName);
@@ -421,6 +421,13 @@ void Serv(int SocketID)
       /* Get request from client */
       while((cc = recv(SocketID,ReqBuf,REQUESTLENGTH,0)) < 0);
+      if (cc == 0)
+      {
+    	  err = REQSENDERR;
+    	  GoOut = 1;
+    	  break;
+      }
+
       err = 0;
 /* Decode Request */
@@ -434,6 +441,11 @@ void Serv(int SocketID)
                xdrmem_create(&xdrs, ReqBuf,REQUESTLENGTH , XDR_FREE);
                while((cc = recv(SocketID,ReqBuf,REQUESTLENGTH,0)) < 0); /* Receive identification packet */
+               if (cc == 0)
+               {
+            	   err = REQSENDERR;
+   	   	    	   break;
+               }
                xdrmem_create(&xdrs, ReqBuf,REQUESTLENGTH, XDR_DECODE);
                xdr_int(&xdrs,&uid);
                xdr_string(&xdrs,&ReqHost,MAXHOSTLENGTH);
@@ -485,6 +497,11 @@ void Serv(int SocketID)
 	       if(VarBuffer != NULL) free(VarBuffer);
 	       VarBuffer = (char *)malloc(sizeof(char)*PacketSize);
 	       while((cc = recv(SocketID,VarBuffer,PacketSize,0)) < 0);
+	       if (cc == 0)
+	       {
+	    	   err = REQSENDERR;
+	    	   break;
+	       }
 	       xdrmem_create(&xdrs, VarBuffer,PacketSize, XDR_DECODE);
 	       xdr_int(&xdrs,&VarSize);
 	       VarNames = (char **)malloc(sizeof(char *) * VarSize);
@@ -506,6 +523,11 @@ void Serv(int SocketID)
           case GETTICKETREQ:
                xdrmem_create(&xdrs, ReqBuf,REQUESTLENGTH , XDR_FREE);
                while((cc = recv(SocketID,ReqBuf,REQUESTLENGTH,0)) < 0);
+               if (cc == 0)
+               {
+            	   err = REQSENDERR;
+            	   break;
+               }
                xdrmem_create(&xdrs, ReqBuf, REQUESTLENGTH, XDR_DECODE);
                xdr_int(&xdrs,&uid);