Update dynlink to expose new cmutils functions; pick up EXECUTABLE=YE…

…S storage changes
zowe · Jan 10, 2025 · 7eb3fed · 7eb3fed
1 parent 59c036a
commit 7eb3fed
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ All notable changes to the ZSS package will be documented in this file.
 
 ## `3.1.0`
 - Enhancement: module registry (#732)
+- Enhancement: expose new cmutils functions (#740)
 
 ## `3.0.0`
 - Enhancement: if no `zowe.logDirectory` is defined in config, logging is disabled. (#726)

diff --git a/c/zis/stubinit.c b/c/zis/stubinit.c
@@ -169,6 +169,10 @@
     stubVector[ZIS_STUB_CMUMAPGH] = (void*)crossMemoryMapGetHandle;
     stubVector[ZIS_STUB_CMUMAPGT] = (void*)crossMemoryMapGet;
     stubVector[ZIS_STUB_CMUMAPIT] = (void*)crossMemoryMapIterate;
+    stubVector[ZIS_STUB_CMALLCX ] = (void*)cmAllocExec;
+    stubVector[ZIS_STUB_CMFREEX ] = (void*)cmFreeExec;
+    stubVector[ZIS_STUB_CMALLC2X] = (void*)cmAlloc2Exec;
+    stubVector[ZIS_STUB_CMFREE2X] = (void*)cmFree2Exec;
     stubVector[ZIS_STUB_FBMGRCRT] = (void*)fbMgrCreate;
     stubVector[ZIS_STUB_FBMGRALC] = (void*)fbMgrAlloc;
     stubVector[ZIS_STUB_FBMGRFRE] = (void*)fbMgrFree;

diff --git a/deps/zowe-common-c b/deps/zowe-common-c
diff --git a/h/zis/zisstubs.h b/h/zis/zisstubs.h
@@ -20,7 +20,7 @@
    FULL BACKWARD COMPATIBILITY MUST BE MAINTAINED
    */
 
-#define ZIS_STUBS_VERSION 5
+#define ZIS_STUBS_VERSION 6
 
 /*
   How does a user check for compatibility?
@@ -232,6 +232,10 @@
 #define ZIS_STUB_CMUMAPGH 278 /* crossMemoryMapGetHandle */
 #define ZIS_STUB_CMUMAPGT 279 /* crossMemoryMapGet */
 #define ZIS_STUB_CMUMAPIT 280 /* crossMemoryMapIterate */
+#define ZIS_STUB_CMALLCX  281 /* cmAllocExec */
+#define ZIS_STUB_CMFREEX  282 /* cmFreeExec */
+#define ZIS_STUB_CMALLC2X 283 /* cmAlloc2Exec */
+#define ZIS_STUB_CMFREE2X 284 /* cmFree2Exec */
 
 /* collections, 290-349 */
 #define ZIS_STUB_FBMGRCRT 290 /* fbMgrCreate */
+5 −1		CHANGELOG.md
+68 −0		c/cmutils.c
+48 −19		c/configmgr.c
+16 −9		c/crossmemory.c
+17 −6		c/httpclient.c
+2 −1		c/qjsnet.c
+21 −2		c/qsam.c
+1 −1		c/recovery.c
+5 −7		c/tls.c
+63 −0		h/cmutils.h
+1 −0		h/configmgr.h
+2 −0		h/httpclient.h
+130 −0		tests/build_recoverytest.sh
+11 −0		tests/configmgr/extract/extract.json
+33 −0		tests/configmgr/extract/extract.yaml
+49 −0		tests/configmgr/extract/index.sh
+589 −0		tests/recoverytest.c
+336 −0		tests/srb_harness.c
+16 −0		tests/srb_harness.h