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

Timestamp:

Aug 7, 2017, 2:56:24 PM (7 years ago)

Author:

djay

Message:

Update the source code for HPC support. Automatically adding nested outputs for the HPC support (should this be available for every support?). Add capability to store the metadata in the Collection DataBase?. Addition of the zcfg2sql to import any existing ZCFG file into the Collection DB. Add the support to invoke a callback (for history purpose) in case a [callback] section contains at least one parameter defined (url). Add support to convert maps and map to JSON (for callback use only by now). Fix some memory leaks (some are still there).

File:

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

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

@@ -9 +9 @@
  * by the French National Research Agency
  *
- * permission is hereby granted, free of charge, to any person obtaining a copy
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -249 +249 @@
  * @return true in case of success, false if failure occured
  */
-size_t ssh_file_exists(maps* conf,const char* targetPath){
+size_t ssh_file_exists(maps* conf,const char* targetPath,int cnt){
   size_t result=-1;
-  int cnt=ssh_get_cnt(conf);
   if(cnt>0)
     cnt-=1;
@@ -303 +302 @@
  * @return true in case of success, false if failure occured
  */
-bool ssh_copy(maps* conf,const char* localPath,const char* targetPath){
+bool ssh_copy(maps* conf,const char* localPath,const char* targetPath,int cnt){
   char mem[1024 * 1000];
   size_t nread;
@@ -310 +309 @@
   long total = 0;
   int duration;
-  int cnt=ssh_get_cnt(conf);
   int rc;
   LIBSSH2_SFTP_HANDLE *sftp_handle;
@@ -323 +321 @@
   if (!local) {
     fprintf(stderr, "Can't open local file %s\n", localPath);
-    return -1;
+    return false;
   }
 
@@ -382 +380 @@
   duration = (int)(time(NULL)-start);
   fclose(local);
-  libssh2_sftp_close(sftp_handle);
+  libssh2_sftp_close_handle(sftp_handle);
 
   libssh2_sftp_shutdown(sessions[cnt]->sftp_session);
@@ -396 +394 @@
  * @return true in case of success, false if failure occured
  */
-int ssh_fetch(maps* conf,const char* localPath,const char* targetPath){
+int ssh_fetch(maps* conf,const char* localPath,const char* targetPath,int cnt){
   char mem[1024];
   size_t nread;
@@ -403 +401 @@
   long total = 0;
   int duration;
-  int cnt=ssh_get_cnt(conf);
   int rc;
   LIBSSH2_SFTP_HANDLE *sftp_handle;
@@ -428 +425 @@
         if (!sftp_handle) {
             if (libssh2_session_last_errno(sessions[cnt]->session) != LIBSSH2_ERROR_EAGAIN) {
-
                 fprintf(stderr, "Unable to open file with SFTP\n");
                 return -1;
@@ -443 +439 @@
         do {
             rc = libssh2_sftp_read(sftp_handle, mem, sizeof(mem));
-            fprintf(stderr, "libssh2_sftp_read returned %d\n",
-                    rc);
- 
+            /*fprintf(stderr, "libssh2_sftp_read returned %d\n",
+              rc);*/
             if(rc > 0) {
-                write(2, mem, rc);
+              //write(2, mem, rc);
                 fwrite(mem, rc, 1, local);
             }
@@ -479 +474 @@
   duration = (int)(time(NULL)-start);
   fclose(local);
-  libssh2_sftp_close(sftp_handle);
+  libssh2_sftp_close_handle(sftp_handle);
 
   libssh2_sftp_shutdown(sessions[cnt]->sftp_session);
@@ -491 +486 @@
  * @return bytecount resulting from the execution of the command
  */
-int ssh_exec(maps* conf,const char* command){
-  int cnt=ssh_get_cnt(conf);
+int ssh_exec(maps* conf,const char* command,int cnt){
   LIBSSH2_CHANNEL *channel;
   int rc;
@@ -571 +565 @@
   while (libssh2_session_disconnect(con->session, "Normal Shutdown, Thank you for using the ZOO-Project sshapi")
          == LIBSSH2_ERROR_EAGAIN);
-  libssh2_session_free(con->session);
 #ifdef WIN32
   closesocket(con->sock_id);
@@ -577 +570 @@
   close(con->sock_id);
 #endif
+  libssh2_session_free(con->session);
   return true;
 }
@@ -596 +590 @@
   return true;
 }
+
+bool addToUploadQueue(maps** conf,maps* input){
+  map* queueMap=getMapFromMaps(*conf,"uploadQueue","length");
+  if(queueMap==NULL){
+    maps* queueMaps=createMaps("uploadQueue");
+    queueMaps->content=createMap("length","0");
+    addMapsToMaps(conf,queueMaps);
+    freeMaps(&queueMaps);
+    free(queueMaps);
+    queueMap=getMapFromMaps(*conf,"uploadQueue","length");
+  }
+  maps* queueMaps=getMaps(*conf,"uploadQueue");
+  int queueIndex=atoi(queueMap->value);
+  if(input!=NULL){
+    if(getMap(input->content,"cache_file")!=NULL){
+      map* length=getMap(input->content,"length");
+      if(length==NULL){
+        addToMap(input->content,"length","1");
+        length=getMap(input->content,"length");
+      }
+      int len=atoi(length->value);
+      int i=0;
+      for(i=0;i<len;i++){
+        
+        map* tmp[2]={getMapArray(input->content,"localPath",i),
+                     getMapArray(input->content,"targetPath",i)};
+
+        setMapArray(queueMaps->content,"input",queueIndex,input->name);
+        setMapArray(queueMaps->content,"localPath",queueIndex,tmp[0]->value);
+        setMapArray(queueMaps->content,"targetPath",queueIndex,tmp[1]->value);
+        queueIndex+=1;
+      }
+    }
+  }
+#ifdef DEBUG  
+  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
+  fflush(stderr);
+  dumpMaps(queueMaps);
+  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
+  fflush(stderr);
+  dumpMaps(*conf);
+  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
+  fflush(stderr);
+#endif
+  return true;
+}
+
+bool runUpload(maps** conf){
+  SSHCON *test=ssh_connect(*conf);
+  if(test==NULL){
+    return false;
+  }
+#ifdef DEBUG
+  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
+  fflush(stderr);
+  dumpMaps(getMaps(*conf,"uploadQueue"));
+  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
+  fflush(stderr);
+#endif
+  map* queueLengthMap=getMapFromMaps(*conf,"uploadQueue","length");
+  maps* queueMaps=getMaps(*conf,"uploadQueue");
+  if(queueLengthMap!=NULL){
+    int cnt=atoi(queueLengthMap->value);
+    int i=0;
+    for(i=0;i<cnt;i++){
+      map* argv[3]={
+        getMapArray(queueMaps->content,"input",i),
+        getMapArray(queueMaps->content,"localPath",i),
+        getMapArray(queueMaps->content,"targetPath",i)
+      };
+      fprintf(stderr,"%s %d %s %s\n",__FILE__,__LINE__,argv[1]->value,argv[2]->value);
+      ssh_copy(*conf,argv[1]->value,argv[2]->value,ssh_get_cnt(*conf));
+    }    
+  }
+  return true; 
+}