Changeset 897 for branches/prototype-v0/zoo-project/zoo-kernel/sshapi.c

Timestamp:

Mar 21, 2019, 4:14:14 PM (5 years ago)

Author:

djay

Message:

Add information abouut semaphore status for future deletion. Make sure to store on disk inputs passed by reference in case no specific memory=load has been set in the [main] section. Fix ticket #170. Add support for publishing raster applying a style definition found in the metadata (zcfg or database).

File:

• branches/prototype-v0/zoo-project/zoo-kernel/sshapi.c (modified) (6 diffs)

branches/prototype-v0/zoo-project/zoo-kernel/sshapi.c

@@ -3 +3 @@
  * Author : Gérald FENOY
  *
- * Copyright 2017 GeoLabs SARL. All rights reserved.
+ * Copyright 2017-2019 GeoLabs SARL. All rights reserved.
  *
  * This work was supported by public funds received in the framework of GEOSUD,
@@ -322 +322 @@
  */
 bool ssh_copy(maps* conf,const char* localPath,const char* targetPath,int cnt){
-  char mem[1024 * 1000];
+  char mem[1024 * 16];
   size_t nread;
   size_t memuse=0;
   time_t start;
   long total = 0;
+  int counter=0;
   int duration;
   int rc;
@@ -391 +392 @@
       break;
     
-    if(memuse - rc) {
-      memmove(&mem[0], &mem[rc], memuse - rc);
-      memuse -= rc;
-    }
-    else
-      memuse = 0;
+    memuse = 0;
     
   } while (rc > 0);
@@ -438 +434 @@
     }
     if(!sessions[cnt]->sftp_session)
-      zSleep(1);
+      zSleep(10);
   } while (!sessions[cnt]->sftp_session);
   do {
@@ -453 +449 @@
     }
     if(!sftp_handle)
-      zSleep(1);
+      zSleep(10);
   } while (!sftp_handle);
- 
+
   int result=0;
+  int counter=0;
   do {
     do {
-      char* mem=(char*)malloc(16*1024*1024);
-      rc = libssh2_sftp_read(sftp_handle, mem,16*1024*1024);
+      char* mem=(char*)malloc(16*1024);
+      rc = libssh2_sftp_read(sftp_handle, mem,16*1024);
       if(rc > 0) {
         fwrite(mem, rc, 1, local);
       }
       free(mem);
+      if(counter%25==0)
+        zSleep(10);
     } while (rc > 0);
-    
+
     if(rc != LIBSSH2_ERROR_EAGAIN) {
       result=-1;
       break;
     }
-    
+
     struct timeval timeout;
     fd_set fd;
     timeout.tv_sec = 10;
     timeout.tv_usec = 0;
- 
+
     FD_ZERO(&fd);
- 
+
     FD_SET(sessions[cnt]->sock_id, &fd);
- 
+
     rc = select(sessions[cnt]->sock_id+1, &fd, &fd, NULL, &timeout);
     if(rc <= 0) {
@@ -489 +488 @@
       return -1;
     }
-    
+
+    if(counter%50==0)
+       zSleep(10);
+    counter++;
+
   } while (1);
   duration = (int)(time(NULL)-start);