Zowe Suite v1.6.0

zowe · Oct 15, 2019 · c9a5f54 · c9a5f54
2 parents 3d2a915 + f0c3932
commit c9a5f54
Show file tree

Hide file tree

Showing 44 changed files with 7,839 additions and 908 deletions.
diff --git a/c/as.c b/c/as.c
diff --git a/c/collections.c b/c/collections.c
@@ -595,7 +595,24 @@ int stringCompare(void *key1, void *key2){
 }
 
 void htDestroy(hashtable *ht){
-  /* printf("htDestroy should apply all key and value reclaimers, if specified\n"); */
+
+  if (ht->keyReclaimer != NULL || ht->valueReclaimer != NULL) {
+
+    for (int i = 0; i < ht->backboneSize; i++) {
+      hashentry *entry = ht->backbone[i];
+      while (entry != NULL) {
+        if (ht->keyReclaimer != NULL) {
+          (ht->keyReclaimer)(entry->key);
+        }
+        if (ht->valueReclaimer != NULL) {
+          (ht->valueReclaimer)(entry->value);
+        }
+        entry = entry->next;
+      }
+    }
+
+  }
+
   fbMgrDestroy(ht->mgr);
   safeFree((char*)ht->backbone,sizeof(hashentry*)*ht->backboneSize);
   safeFree((char*)ht,sizeof(hashtable));

diff --git a/c/crossmemory.c b/c/crossmemory.c
@@ -4,9 +4,9 @@
   This program and the accompanying materials are
   made available under the terms of the Eclipse Public License v2.0 which accompanies
   this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html
-  
+
   SPDX-License-Identifier: EPL-2.0
-  
+
   Copyright Contributors to the Zowe Project.
 */
 
@@ -3110,7 +3110,7 @@ static void handleAsyncModifyCommand(CrossMemoryServer *server,
               (void *)command, commandLength);
      wtoPrintf2(consoleID, cart, CMS_LOG_CMD_TKNZ_FAILURE_MSG);
    }
-
+   SLHFree(slh);
 }
 
 static int commandTaskHandler(RLETask *rleTask) {
@@ -4267,8 +4267,8 @@ void crossmemoryServerDESCTs(){
   This program and the accompanying materials are
   made available under the terms of the Eclipse Public License v2.0 which accompanies
   this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html
-  
+
   SPDX-License-Identifier: EPL-2.0
-  
+
   Copyright Contributors to the Zowe Project.
 */
diff --git a/c/dataservice.c b/c/dataservice.c
@@ -141,7 +141,8 @@ static void *lookupDLLEntryPoint(char *libraryName, char *functionName){
   return ep;
 }
 
-static DataService *makeDataService(WebPlugin *plugin, JsonObject *serviceJsonObject, char *subURI, InternalAPIMap *namedAPIMap) {
+static DataService *makeDataService(WebPlugin *plugin, JsonObject *serviceJsonObject, char *subURI, InternalAPIMap *namedAPIMap,
+                                    unsigned int *idMultiplier, int pluginLogLevel) {
   zowelog(NULL, LOG_COMP_DATASERVICE, ZOWE_LOG_INFO, "%s begin data service:\n", __FUNCTION__);
   DataService *service = (DataService*) safeMalloc(sizeof (DataService), "DataService");
   memset(service, 0, sizeof (DataService));
@@ -166,6 +167,11 @@ static DataService *makeDataService(WebPlugin *plugin, JsonObject *serviceJsonOb
   } else {
     sprintf(service->identifier, "%s", plugin->identifier);
   }
+
+  service->loggingIdentifier = LOG_PROD_PLUGINS + (0x10000 * (*idMultiplier));
+  logConfigureComponent(NULL, service->loggingIdentifier, service->identifier,
+                        LOG_DEST_PRINTF_STDOUT, pluginLogLevel);
+  zowelog(NULL, service->loggingIdentifier, ZOWE_LOG_WARNING, "added identifier for %s\n", service->identifier);
 
   char *initializerLookupMethod = jsonObjectGetString(serviceJsonObject, "initializerLookupMethod");
   char *initializerName = jsonObjectGetString(serviceJsonObject, "initializerName");
@@ -252,7 +258,8 @@ static bool isValidServiceDef(JsonObject *serviceDef) {
   return true;
 }
 
-WebPlugin *makeWebPlugin(char *pluginLocation, JsonObject *pluginDefintion, InternalAPIMap *internalAPIMap) {
+WebPlugin *makeWebPlugin(char *pluginLocation, JsonObject *pluginDefintion, InternalAPIMap *internalAPIMap,
+                         unsigned int *idMultiplier, int pluginLogLevel) {
   zowelog(NULL, LOG_COMP_DATASERVICE, ZOWE_LOG_INFO, "%s begin\n", __FUNCTION__);
   WebPlugin *plugin = (WebPlugin*)safeMalloc(sizeof(WebPlugin),"WebPlugin");
   memset(plugin, 0, sizeof (WebPlugin));
@@ -298,13 +305,17 @@ WebPlugin *makeWebPlugin(char *pluginLocation, JsonObject *pluginDefintion, Inte
       char *type = jsonObjectGetString(serviceDef, "type");
 
       if (!type || !strcmp(type, "service")) {
-        plugin->dataServices[k++] = makeDataService(plugin, jsonArrayGetObject(dataServices, i), NULL, internalAPIMap);
+        plugin->dataServices[k++] = makeDataService(plugin, jsonArrayGetObject(dataServices, i), NULL, internalAPIMap,
+                                                    idMultiplier, pluginLogLevel);
+        (*idMultiplier++);
       } else if (!strcmp(type, "group")) {
         char *subURI = jsonObjectGetString(serviceDef, "name");
         JsonArray* group = jsonObjectGetArray(serviceDef, "subservices");
         if (group) {
           for (int j = 0; j < jsonArrayGetCount(group); j++) {
-            plugin->dataServices[k++] = makeDataService(plugin, jsonArrayGetObject(group, j), subURI, internalAPIMap);
+            plugin->dataServices[k++] = makeDataService(plugin, jsonArrayGetObject(group, j), subURI, internalAPIMap,
+                                                        idMultiplier, pluginLogLevel);
+            (*idMultiplier++);
           }
         }
       } else {