#683 updated for v3.x/staging

.github/workflows/build_test.yml

@@ -2,7 +2,8 @@ name: Build and Test Workflow
 on:
   push:
     branches:
-      - v2.x/staging 
+      - v3.x/staging
+      - v3.x/rc      
   pull_request:
     types: [opened, reopened, synchronize]
   workflow_dispatch:

CHANGELOG.md

@@ -2,7 +2,11 @@
 
 All notable changes to the ZSS package will be documented in this file.
 
-## `2.18.1`
+## `3.1.0`
+- Enhancement: module registry (#732)
+
+## `3.0.0`
+- Enhancement: if no `zowe.logDirectory` is defined in config, logging is disabled. (#726)
 - Bugfix: Support cross-memory server parameters longer than 128 characters (#684)
 - Enhancement: Expose new cross-memory server's functions in dynlink (#684)
 

README.md

@@ -35,7 +35,7 @@ export ZWE_zowe_runtimeDirectory=/path/to/zowe-install-packaging
 ZWE_CLI_PARAMETER_CONFIG="FILE(/my/zowe.yaml)" ./zssServer.sh
 ```
 
-Note: ZSS defaults are in [defaults.yaml](https://github.com/zowe/zss/blob/v2.x/staging/defaults.yaml) so you only need to provide customizations in your own zowe.yaml.
+Note: ZSS defaults are in [defaults.yaml](https://github.com/zowe/zss/blob/v3.x/staging/defaults.yaml) so you only need to provide customizations in your own zowe.yaml.
 
 ## How to submit a pull request
 
@@ -57,15 +57,15 @@ git add deps/zowe-common-c/
 When using ZSS as the agent to host files and folders, for example: for the Zowe Editor Desktop app by the App server, may lead to '401 Impersonator Error'
 Fix: Make sure the program-controlled bit is set for your ZSS binary `extattr +p zssServer`
 
-ZSS in V2 takes advantage of V2 by using schemas and the Zowe configuration YAML. If you're running `zssServer` accidentally, instead of `zssServer.sh` or your `zssServer.sh` is out of date, you may see an error on start like `ZSS 2.x requires schemas and config`
+ZSS in V3 takes advantage of V3 by using schemas and the Zowe configuration YAML. If you're running `zssServer` accidentally, instead of `zssServer.sh` or your `zssServer.sh` is out of date, you may see an error on start like `ZSS 2.x requires schemas and config`
 
 When starting ZSS, you may encounter a schema validation issue i.e. `Configuration has validity exceptions: Schema at '' invalid [...]`. 
 Fix: To read these errors, consult: https://docs.zowe.org/stable/user-guide/configmgr-using/#validation-error-reporting
 Note: ZSS has a default schema in `$ZWES_COMPONENT_HOME/schemas` and default configuration YAML in `$ZWES_COMPONENT_HOME/defaults.yaml`
 
 ## Mock server
 
-If you don't have access to z/OS, or want to help expand the Mock server, find it at: https://github.com/zowe/zss/tree/v2.x/staging/mock
+If you don't have access to z/OS, or want to help expand the Mock server, find it at: https://github.com/zowe/zss/tree/v3.x/staging/mock
 
 This program and the accompanying materials are
 made available under the terms of the Eclipse Public License v2.0 which accompanies

bin/start.sh

@@ -74,20 +74,27 @@ if [[ "${OSNAME}" == "OS/390" ]]; then
       then
         ZWES_LOG_DIR=${ZWE_zowe_logDirectory}
       else
-        ZWES_LOG_DIR="../log"
+        if [ -z "${ZWE_zowe_runtimeDirectory}" ]; then
+          ZWES_LOG_DIR="../log"
+        else
+          echo "No log directory. Logging disabled."
+          ZWES_LOG_DIR=
+          ZWES_LOG_FILE=/dev/null
+        fi
       fi
     fi
     if [ -f "$ZWES_LOG_DIR" ]
     then
       ZWES_LOG_FILE=$ZWES_LOG_DIR
     elif [ ! -d "$ZWES_LOG_DIR" ]
     then
-      echo "Will make log directory $ZWES_LOG_DIR"
-      mkdir -p $ZWES_LOG_DIR
-      if [ $? -ne 0 ]
-      then
-        echo "Cannot make log directory.  Logging disabled."
-        ZWES_LOG_FILE=/dev/null
+      if [ -n "${ZWES_LOG_DIR}" ]; then
+        echo "Will make log directory $ZWES_LOG_DIR"
+        mkdir -p $ZWES_LOG_DIR
+        if [ $? -ne 0 ]; then
+          echo "Cannot make log directory.  Logging disabled."
+          ZWES_LOG_FILE=/dev/null
+        fi
       fi
     fi
     ZWES_ROTATE_LOGS=0
@@ -168,7 +175,7 @@ if [[ "${OSNAME}" == "OS/390" ]]; then
   ZSS_SERVER_31="./zssServer"
   ZSS_SERVER_64="./zssServer64"
 
-  if [ "$ZWE_components_zss_agent_64bit" = "true" ] && [ -x "${ZSS_SERVER_64}" ]; then
+  if [ "$ZWE_components_zss_agent_64bit" != "false" ] && [ -x "${ZSS_SERVER_64}" ]; then
     ZSS_SERVER="${ZSS_SERVER_64}"
   else
     ZSS_SERVER="${ZSS_SERVER_31}"

build/build_dynamic.sh

@@ -50,12 +50,15 @@ xlc -S -M -qmetal -q64 -DSUBPOOL=132 -DMETTLE=1 -DMSGPREFIX=\"ZWE\" \
   -DZISDYN_REVISION="$micro" \
   -DZISDYN_VERSION_DATE_STAMP="$date_stamp" \
   -DZISDYN_PLUGIN_VERSION=${DYNLINK_PLUGIN_VERSION} \
+  -DLPA_LOG_DEBUG_MSG_ID=\"ZWES0100I\" \
+  -DMODREG_LOG_DEBUG_MSG_ID=\"ZWES0100I\" \
   -qreserved_reg=r12 \
   -DRCVR_CPOOL_STATES \
   -DHAVE_METALIO=1 \
   -Wc,langlvl\(extc99\),arch\(8\),agg,exp,list\(\),so\(\),off,xref,roconst,longname,lp64 \
   -I ${COMMON}/h -I ${ZSS}/h \
   -I ${ZSS}/zis-aux/include -I ${ZSS}/zis-aux/src \
+  -I /usr/include/zos \
   ${ZSS}/c/zis/zisdynamic.c \
   ${ZSS}/c/zis/server-api.c \
   ${ZSS}/c/zis/client.c \
@@ -81,6 +84,7 @@ xlc -S -M -qmetal -q64 -DSUBPOOL=132 -DMETTLE=1 -DMSGPREFIX=\"ZWE\" \
   ${COMMON}/c/logging.c \
   ${COMMON}/c/lpa.c \
   ${COMMON}/c/metalio.c \
+  ${COMMON}/c/modreg.c \
   ${COMMON}/c/nametoken.c \
   ${COMMON}/c/pause-element.c \
   ${COMMON}/c/pc.c \
@@ -125,6 +129,7 @@ for file in \
     logging \
     lpa \
     metalio \
+    modreg \
     nametoken \
     pause-element \
     pc \
@@ -173,6 +178,7 @@ le.o \
 logging.o \
 lpa.o \
 metalio.o \
+modreg.o \
 nametoken.o \
 pause-element.o \
 pc.o \

build/build_zis.sh

@@ -56,9 +56,12 @@ xlc -S -M -qmetal -q64 -DSUBPOOL=132 -DMETTLE=1 -DMSGPREFIX=\"ZWE\" \
   -DZIS_VERSION_DATE_STAMP="$date_stamp" \
   -DRADMIN_XMEM_MODE \
   -DRCVR_CPOOL_STATES \
+  -DLPA_LOG_DEBUG_MSG_ID=\"ZWES0100I\" \
+  -DMODREG_LOG_DEBUG_MSG_ID=\"ZWES0100I\" \
   -qreserved_reg=r12 \
   -Wc,arch\(8\),agg,exp,list\(\),so\(\),off,xref,roconst,longname,lp64 \
   -I ${COMMON}/h -I ${ZSS}/h -I ${ZSS}/zis-aux/include -I ${ZSS}/zis-aux/src \
+  -I /usr/include/zos \
    ${COMMON}/c/alloc.c \
    ${COMMON}/c/as.c \
    ${COMMON}/c/cellpool.c \
@@ -70,6 +73,7 @@ xlc -S -M -qmetal -q64 -DSUBPOOL=132 -DMETTLE=1 -DMSGPREFIX=\"ZWE\" \
    ${COMMON}/c/logging.c \
    ${COMMON}/c/lpa.c \
    ${COMMON}/c/metalio.c \
+   ${COMMON}/c/modreg.c \
    ${COMMON}/c/mtlskt.c \
    ${COMMON}/c/nametoken.c \
    ${COMMON}/c/pause-element.c \
@@ -102,7 +106,7 @@ xlc -S -M -qmetal -q64 -DSUBPOOL=132 -DMETTLE=1 -DMSGPREFIX=\"ZWE\" \
    ${ZSS}/zis-aux/src/aux-host.c
 
 for file in \
-    alloc as cellpool cmutils collections crossmemory isgenq le logging lpa metalio mtlskt nametoken \
+    alloc as cellpool cmutils collections crossmemory isgenq le logging lpa metalio modreg mtlskt nametoken \
     pause-element pc qsam radmin recovery resmgr scheduling shrmem64 stcbase timeutls utils xlate \
     zos zvt \
     parm plugin server server-api service \
@@ -125,6 +129,7 @@ ld -V -b ac=1 -b rent -b case=mixed -b map -b xref -b reus \
   logging.o \
   lpa.o \
   metalio.o \
+  modreg.o \
   mtlskt.o \
   nametoken.o \
   qsam.o \
@@ -165,6 +170,7 @@ ld -V -b ac=1 -b rent -b case=mixed -b map -b xref -b reus \
   logging.o \
   lpa.o \
   metalio.o \
+  modreg.o \
   mtlskt.o \
   nametoken.o \
   pause-element.o \

build/zis.proj.env

@@ -1,4 +1,4 @@
 PROJECT="zis"
-VERSION=2.18.0
+VERSION=3.0.0
 DYNLINK_PLUGIN_VERSION=11
 DEPS=""

build/zss.proj.env

@@ -1,5 +1,5 @@
 PROJECT="zss"
-VERSION=2.18.0
+VERSION=3.1.0
 DEPS="QUICKJS LIBYAML"
 
 QUICKJS="quickjs"

c/zis/server-api.c

@@ -31,6 +31,10 @@ _Bool zisIsLPADevModeOn(const ZISContext *context) {
   return (context->cmsFlags & devFlags) || ZIS_LPA_DEV_MODE;
 }
 
+_Bool zisIsModregOn(const ZISContext *context) {
+  return context->cmsFlags & CMS_SERVER_FLAG_USE_MODREG;
+}
+
 void zisGetServerVersion(int *major, int *minor, int *revision) {
   *major = -1;
   *minor = -1;

c/zis/server.c

@@ -32,6 +32,7 @@
 #include "stcbase.h"
 #include "utils.h"
 #include "recovery.h"
+#include "modreg.h"
 
 #include "zis/message.h"
 #include "zis/parm.h"
@@ -82,6 +83,9 @@ See details in the ZSS Cross Memory Server installation guide
 #define ZIS_PARM_DEV_MODE_LPA                 CMS_PROD_ID".DEV_MODE.LPA"
   #define ZIS_PARM_DEV_MODE_ON                  "YES"
 
+#define ZIS_PARM_MODREG                       CMS_PROD_ID".MODULE_REGISTRY"
+  #define ZIS_PARM_MODREG_OFF                   "NO"
+
 #define ZIS_PARMLIB_PARM_SERVER_NAME          CMS_PROD_ID".NAME"
 
 #define ZIS_DYN_LINKAGE_PLUGIN_MOD_SUFFIX     "ISDL"
@@ -676,18 +680,49 @@ static int relocatePluginToLPAIfNeeded(ZISContext *context,
   /* Check if LPA, and load if needed */
   if (lpaNeeded) {
 
+    const char *status = "n/a";
+
     if (!lpaPresent) {
 
       EightCharString ddname = {"STEPLIB "};
-      int lpaRSN = 0;
-      int lpaRC = lpaAdd(&anchor->moduleInfo, &ddname, &moduleName, &lpaRSN);
-      if (lpaRC != 0) {
-        zowelog(NULL, LOG_COMP_ID_CMS, ZOWE_LOG_SEVERE, ZIS_LOG_LPA_FAILURE_MSG,
-                "ADD", anchor->moduleInfo.inputInfo.name, lpaRC, lpaRSN);
-        return RC_ZIS_ERROR;
+
+      if (zisIsModregOn(context) && !zisIsLPADevModeOn(context)) {
+        uint64_t modregRSN;
+        int modregRC = modregRegister(ddname, moduleName, &anchor->moduleInfo,
+                                      &modregRSN);
+        if (modregRC == RC_MODREG_OK) {
+          status = "new instance added to registry";
+          lpaPresent = true;
+        } else if (modregRC == RC_MODREG_ALREADY_REGISTERED) {
+          status = "existing instance reused from registry";
+          lpaPresent = true;
+        }  else if (modregRC == RC_MODREG_MARK_MISSING) {
+          zowelog(NULL, LOG_COMP_ID_CMS, ZOWE_LOG_INFO,
+                  ZIS_LOG_MODREG_NO_MARK_MSG, moduleName.text);
+        } else {
+          zowelog(NULL, LOG_COMP_ID_CMS, ZOWE_LOG_SEVERE,
+                  ZIS_LOG_MODREG_FAILURE_MSG, moduleName.text,
+                  modregRC, modregRSN);
+          return RC_ZIS_ERROR;
+        }
+      }
+
+      if (!lpaPresent) {
+        int lpaRSN = 0;
+        int lpaRC = lpaAdd(&anchor->moduleInfo, &ddname, &moduleName, &lpaRSN);
+        if (lpaRC == 0) {
+          status = "own instance loaded to LPA";
+        } else {
+          zowelog(NULL, LOG_COMP_ID_CMS, ZOWE_LOG_SEVERE,
+                  ZIS_LOG_LPA_FAILURE_MSG,
+                  "ADD", moduleName.text, lpaRC, lpaRSN);
+          return RC_ZIS_ERROR;
+        }
       }
 
       anchor->flags |= ZIS_PLUGIN_ANCHOR_FLAG_LPA;
+    } else {
+      status = "previously added/loaded instance reused";
     }
 
     /* Invoke EP to get relocated services */
@@ -699,6 +734,16 @@ static int relocatePluginToLPAIfNeeded(ZISContext *context,
 
     *pluginAddr = getPluginDescriptor();
 
+    zowelog(NULL, LOG_COMP_ID_CMS, ZOWE_LOG_INFO,
+            ZIS_LOG_MODULE_STATUS_MSG" (%p)", moduleName.text, status,
+            lpaInfo->outputInfo.stuff.successInfo.loadPointAddr);
+
+  } else {
+
+    zowelog(NULL, LOG_COMP_ID_CMS, ZOWE_LOG_INFO,
+            ZIS_LOG_MODULE_STATUS_MSG, moduleName.text,
+            "private storage instance used");
+
   }
 
   return RC_ZIS_OK;
@@ -1443,7 +1488,7 @@ static int loadConfig(ZISContext *context,
 
 static int getCMSConfigFlags(const ZISParmSet *zisParms) {
 
-  int flags = CMS_SERVER_FLAG_NONE;
+  int flags = CMS_SERVER_FLAG_USE_MODREG;
 
   const char *coldStartValue = zisGetParmValue(zisParms, ZIS_PARM_COLD_START);
   if (coldStartValue && strlen(coldStartValue) == 0) {
@@ -1475,6 +1520,11 @@ static int getCMSConfigFlags(const ZISParmSet *zisParms) {
     flags |= CMS_SERVER_FLAG_RESET_LOOKUP;
   }
 
+  const char *modregMode = zisGetParmValue(zisParms, ZIS_PARM_MODREG);
+  if (modregMode && !strcmp(modregMode, ZIS_PARM_MODREG_OFF)) {
+    flags &= ~CMS_SERVER_FLAG_USE_MODREG;
+  }
+
   return flags;
 }
 

c/zis/stubinit.c

@@ -12,6 +12,7 @@
     stubVector[ZIS_STUB_ZISDYNPV] = (void*)zisdynGetPluginVersion;
     stubVector[ZIS_STUB_ZISGVRSN] = (void*)zisGetServerVersion;
     stubVector[ZIS_STUB_ZISLPADV] = (void*)zisIsLPADevModeOn;
+    stubVector[ZIS_STUB_ZISMDREG] = (void*)zisIsModregOn;
     stubVector[ZIS_STUB_ZISCSRVC] = (void*)zisCallService;
     stubVector[ZIS_STUB_ZISCUSVC] = (void*)zisCallServiceUnchecked;
     stubVector[ZIS_STUB_ZISCVSVC] = (void*)zisCallVersionedService;
@@ -558,6 +559,7 @@
     stubVector[ZIS_STUB_ZVTFENTR] = (void*)zvtFreeEntry;
     stubVector[ZIS_STUB_ZVTGXMLR] = (void*)zvtGetCMSLookupRoutineAnchor;
     stubVector[ZIS_STUB_ZVTSXMLR] = (void*)zvtSetCMSLookupRoutineAnchor;
+    stubVector[ZIS_STUB_MODRRGST] = (void*)modregRegister;
 /*
   This program and the accompanying materials are
   made available under the terms of the Eclipse Public License v2.0 which accompanies

c/zis/zisdynamic.c

@@ -31,6 +31,7 @@
 #include "logging.h"
 #include "lpa.h"
 #include "metalio.h"
+#include "modreg.h"
 #include "nametoken.h"
 #include "pause-element.h"
 #include "pc.h"
@@ -423,6 +424,8 @@ static int verifyZISVersion(void) {
 
 ZISPlugin *getPluginDescriptor(void) {
 
+  MODREG_MARK_MODULE();
+
   if (verifyZISVersion() != 0) {
     return NULL;
   }