Various enhancements for zopen tools

CMakeLists.txt

@@ -53,6 +53,11 @@ if(ZOSLIB_GENERIC)
        ZOSLIB_GENERIC)
 endif()
 
+if(ZOSLIB_QUICK_STARTUP)
+  list(APPEND zoslib_defines
+       ZOSLIB_QUICK_STARTUP)
+endif()
+
 
 if(DEFINED ENV{BUILD_VERSION})
   list(APPEND zoslib_defines BUILD_VERSION="$ENV{BUILD_VERSION}")
@@ -81,7 +86,7 @@ else()
   list(APPEND zoslib_cflags
     -fgnu-keywords
     -m64
-    -march=arch14
+    -march=arch10
     -mzos-target=zosv2r4
     -fno-short-enums
     -fzos-le-char-mode=ascii)

include/c++/v1/__threading_support

@@ -0,0 +1,19 @@
+///////////////////////////////////////////////////////////////////////////////
+// Licensed Materials - Property of IBM
+// ZOSLIB
+// (C) Copyright IBM Corp. 2022. All Rights Reserved.
+// US Government Users Restricted Rights - Use, duplication
+// or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef ZOS_LIBCPP_THREADING_SUPPORT
+#define ZOS_LIBCPP_THREADING_SUPPORT
+
+//TODO(itodorov) - zos: workaround for nanosleep WoZ conflict, revisit
+// once WoZ allow overriding or LE provides a nanosleep definition
+#include <time.h>
+#define nanosleep cpp_nanosleep
+#include_next <__threading_support>
+#undef nanosleep
+
+#endif

include/netinet/in_systm.h

@@ -0,0 +1,19 @@
+///////////////////////////////////////////////////////////////////////////////
+// Licensed Materials - Property of IBM
+// ZOSLIB
+// (C) Copyright IBM Corp. 2024. All Rights Reserved.
+// US Government Users Restricted Rights - Use, duplication
+// or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef ZOS_IN_SYSTM_H_
+#define ZOS_IN_SYSTM_H_
+
+#include <stdint.h>
+
+// Network types
+typedef uint16_t n_short; 
+typedef uint32_t n_long;
+typedef uint32_t n_time;
+
+#endif 

include/pthread.h

@@ -0,0 +1,55 @@
+///////////////////////////////////////////////////////////////////////////////
+// Licensed Materials - Property of IBM
+// ZOSLIB
+// (C) Copyright IBM Corp. 2021. All Rights Reserved.
+// US Government Users Restricted Rights - Use, duplication
+// or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef ZOS_PTHREAD_H_
+#define ZOS_PTHREAD_H_
+
+#define __XPLAT 1
+#include "zos-macros.h"
+#include <sys/types.h>
+
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+__Z_EXPORT int __pthread_create_extended(pthread_t *thread,
+                          const pthread_attr_t *attr,
+                          void *(*start_routine)(void *),
+                          void *arg); 
+#if defined(__cplusplus)
+}
+#endif
+
+#if defined(ZOSLIB_OVERRIDE_CLIB) || defined(ZOSLIB_OVERRIDE_CLIB_PTHREAD)
+#define pthread_create __pthread_create_replaced
+#endif
+
+#include_next <pthread.h>
+
+#if defined(ZOSLIB_OVERRIDE_CLIB) || defined(ZOSLIB_OVERRIDE_CLIB_PTHREAD)
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#undef pthread_create 
+__Z_EXPORT int pthread_create(pthread_t *thread,
+                          const pthread_attr_t *attr,
+                          void *(*start_routine)(void *),
+                          void *arg) asm("__pthread_create_extended");
+
+#if defined(__cplusplus)
+}
+#endif
+#endif /* defined(ZOSLIB_OVERRIDE_CLIB) || defined(ZOSLIB_OVERRIDE_CLIB_PTHREAD) */
+
+#ifndef PTHREAD_RWLOCK_INITIALIZER
+#define PTHREAD_RWLOCK_INITIALIZER PTHREAD_RWLOCK_INITIALIZER_NP
+#endif
+
+#endif

include/stdio.h

@@ -10,6 +10,7 @@
 #define ZOS_STDIO_H_
 
 #include "zos-macros.h"
+#include <sys/types.h>
 
 #define __XPLAT 1
 
@@ -39,6 +40,8 @@ extern "C" {
 #endif
 
 __Z_EXPORT extern FILE *fopen(const char *filename, const char *mode) __asm("__fopen_ascii");
+__Z_EXPORT ssize_t getline(char **lineptr, size_t *n, FILE *stream);
+__Z_EXPORT ssize_t getdelim(char **lineptr, size_t *n, int delimiter, FILE *stream);
 
 #if defined(__cplusplus)
 }

include/stdlib.h

@@ -104,6 +104,9 @@ extern "C" {
  */
 __Z_EXPORT int getloadavg(double loadavg[], int nelem);
 __Z_EXPORT const char * getprogname(void);
+__Z_EXPORT int mkostemp(char *, int flags);
+__Z_EXPORT int mkstemps(char *, int suffixlen);
+__Z_EXPORT int mkostemps(char *, int suffixlen, int flags);
 #if defined(__cplusplus)
 }
 #endif

include/string.h

@@ -24,6 +24,8 @@ __Z_EXPORT char *strndup(const char *s, size_t n);
 __Z_EXPORT char *strsignal(int );
 __Z_EXPORT const char *sigdescr_np(int);
 __Z_EXPORT const char *sigabbrev_np(int);
+__Z_EXPORT void *memmem(const void *haystack, size_t haystacklen, const void *needle, size_t needlelen);
+__Z_EXPORT int strverscmp(const char *l0, const char *r0);
 
 // Linux includes strings.h in string.h, this avoids the 
 // warning - implicitly declaring library function 'strcasecmp'

include/unistd.h

@@ -17,6 +17,8 @@ extern "C" {
 #endif
 __Z_EXPORT int __pipe_ascii(int [2]);
 __Z_EXPORT int __close(int);
+__Z_EXPORT int __sysconf(int name);
+
 #if defined(__cplusplus)
 }
 #endif
@@ -27,19 +29,28 @@ __Z_EXPORT int __close(int);
 #define pipe __pipe_replaced
 #undef close
 #define close __close_replaced
+#undef sysconf
+#define sysconf __sysconf_replaced
+#undef readlink
+#define readlink __readlink_replaced
 #include_next <unistd.h>
 #undef pipe
 #undef close
+#undef sysconf
+#undef readlink
 
 #if defined(__cplusplus)
 extern "C" {
 #endif
-
 /**
  * Same as C pipe but tags pipes as ASCII (819)
  */
 __Z_EXPORT int pipe(int [2]) __asm("__pipe_ascii");
 __Z_EXPORT int close(int) __asm("__close");
+__Z_EXPORT int close(int) __asm("__close");
+__Z_EXPORT int sysconf(int name) __asm("__sysconf");
+__Z_EXPORT ssize_t readlink(const char *path, char *buf, size_t bufsiz) asm("__readlink");
+
 
 #if defined(__cplusplus)
 }
@@ -75,4 +86,8 @@ __Z_EXPORT int execvpe(const char *name, char *const argv[],
 }
 #endif
 
+#ifndef _SC_NPROCESSORS_ONLN
+#define _SC_NPROCESSORS_ONLN 58 /* match linux */
+#endif
+
 #endif

include/zos-base.h

@@ -39,6 +39,16 @@
 #define __ZL_NR(attr,reg) attr "{" #reg "}"
 #endif 
 
+#if defined(__clang__) && !defined(__ibmxl__)
+#define _gdsa __builtin_s390_gdsa
+#else
+extern "builtin" void *_gdsa();
+#endif
+
+#ifndef __dsa
+#define __dsa() ((unsigned long *)_gdsa())
+#endif
+
 #include "zos-macros.h"
 #include "zos-bpx.h"
 #include "zos-char-util.h"

include/zos-v2r5-symbolfixes.h

@@ -23,7 +23,6 @@
 #pragma redefine_extname getrandom getrandom_undefined
 #pragma redefine_extname pipe2 pipe2_undefined
 #pragma redefine_extname fsstatfs fsstatfs_undefined
-#pragma redefine_extname getline getline_undefined
 #pragma redefine_extname dprintf dprintf_undefined
 #pragma redefine_extname dirfd dirfd_undefined
 #pragma redefine_extname fchmodat fchmodat_undefined
@@ -45,6 +44,7 @@
 #pragma redefine_extname setresgid setresgid_undefined
 #pragma redefine_extname dup3 dup3_undefined
 #pragma redefine_extname shm_open shm_open_undefined
+#pragma redefine_extname utimensat utimensat_undefined
 #endif
 
 #endif // ZOS_V2R5_SYMBOLFIXES_H

src/CMakeLists.txt

@@ -20,6 +20,7 @@ set(libsrc
   zos.cc
   zos-mount.c
   zos-mkdtemp.c
+  zos-instrumentation.cc
 )
 set(zoslib-help zoslib-help.cc)
 
@@ -35,6 +36,10 @@ COMMAND /bin/as -mgoff -o ${CELQUOPT_OBJECT} ${CELQUOPT_SOURCE}
   VERBATIM
 )
 
+if(${CMAKE_C_COMPILER} MATCHES clang)
+  set_source_files_properties(zos-getentropy.cc PROPERTIES COMPILE_FLAGS "-march=arch14")
+endif()
+
 add_library(libzoslib OBJECT ${libsrc})
 
 add_library(zoslib SHARED $<TARGET_OBJECTS:libzoslib>)

src/zos-bpx.cc

@@ -90,6 +90,35 @@ char *__realpath_extended(const char __restrict__ *path, char __restrict__ *reso
    return __realpath_orig(path, resolved_path);
 }
 
+ssize_t __readlink_orig(const char *path, char *buf, size_t bufsiz) asm("@@A00202");
+
+ssize_t __readlink(const char *path, char *buf, size_t bufsiz) {
+  ssize_t len = __readlink_orig(path, buf, bufsiz);
+  if (len < 0) {
+      return -1;
+  }
+
+  if ((len > 0 && buf[0] == '$') || (len > 1 && buf[0] == '/' && buf[1] == '$')) {
+      // Not sure if this is possible, but double check in case:
+      if (len < bufsiz) {
+          buf[len] = '\0';
+      } else {
+          buf[bufsiz - 1] = '\0';
+      }
+      char resolved_path[PATH_MAX];
+      if (realpath(path, resolved_path) == NULL) {
+          return -1;
+      }
+
+      len = snprintf(buf, bufsiz, "%s", resolved_path);
+      if (len >= bufsiz) {
+          errno = ENAMETOOLONG;
+          return -1;
+      }
+  }
+
+  return len;
+}
 
 void __bpx4kil(int pid, int signal, void *signal_options, int *return_value,
                int *return_code, int *reason_code) {

src/zos-char-util.cc

@@ -496,6 +496,7 @@ class fdAttributeCache {
 };
 
 fdAttributeCache fdcache;
+#define FD_NEEDS_CONVERSION_ATTR 0x0000000000020000UL
 
 void __fd_close(int fd) { 
   if (!bfdcache_destroyed)
@@ -506,7 +507,7 @@ int __file_needs_conversion(int fd) {
   if (__get_no_tag_read_behaviour() == __NO_TAG_READ_STRICT)
     return 0;
   unsigned long attr = fdcache.get_attribute(fd);
-  if (attr == 0x0000000000020000UL) {
+  if (attr == FD_NEEDS_CONVERSION_ATTR) {
     return 1;
   }
   return 0;
@@ -527,7 +528,7 @@ int __file_needs_conversion_init(const char *name, int fd) {
   if (no_tag_read_behaviour == __NO_TAG_READ_STRICT)
     return 0;
   if (no_tag_read_behaviour == __NO_TAG_READ_V6) {
-    fdcache.set_attribute(fd, 0x0000000000020000UL);
+    fdcache.set_attribute(fd, FD_NEEDS_CONVERSION_ATTR);
     return 1;
   }
   if (lseek(fd, 1, SEEK_SET) == 1 && lseek(fd, 0, SEEK_SET) == 0) {
@@ -539,27 +540,25 @@ int __file_needs_conversion_init(const char *name, int fd) {
       close(fd);
       return 0;
     }
-    if (cnt > 8) {
-      int ccsid;
-      int am;
-      unsigned len = strlen_ae((unsigned char *)buf, &ccsid, cnt, &am);
-      if (ccsid == 1047 && len == cnt) {
-        if (no_tag_read_behaviour == __NO_TAG_READ_DEFAULT_WITHWARNING) {
-          if (name) {
-            len = strlen(name) + 1;
-            char filename[len];
-            _convert_e2a(filename, name, len);
-            dprintf(2, "Warning: File \"%s\" is untagged and seems to contain "
-                       "EBCDIC characters\n", filename);
-          } else {
-            dprintf(2, "Warning: File (null) is untagged and seems to contain "
-                       "EBCDIC characters\n");
-          }
+    int ccsid;
+    int am;
+    unsigned len = strlen_ae((unsigned char *)buf, &ccsid, cnt, &am);
+    if (ccsid == 1047 && len == cnt) {
+      if (no_tag_read_behaviour == __NO_TAG_READ_DEFAULT_WITHWARNING) {
+        if (name) {
+          len = strlen(name);
+          char filename[len + 1];
+          _convert_e2a(filename, name, len);
+          dprintf(2, "Warning: File \"%s\" is untagged and seems to contain "
+                      "EBCDIC characters\n", filename);
+        } else {
+          dprintf(2, "Warning: File (null) is untagged and seems to contain "
+                      "EBCDIC characters\n");
         }
-        fdcache.set_attribute(fd, 0x0000000000020000UL);
-        return 1;
       }
-    }       // cnt > 8
+      fdcache.set_attribute(fd, FD_NEEDS_CONVERSION_ATTR);
+      return 1;
+    }
   }         // seekable files
   return 0; // not seekable
 }