Merge branch 'cooperative-computing-lab:master' into library-infile-load-mode

Author: JinZhou5042

.github/workflows/testing.yml

@@ -139,7 +139,7 @@ jobs:
     runs-on: ${{ matrix.os-name }}
     strategy:
       matrix:
-        os-name: ['macos-14','macos-13']
+        os-name: ['macos-14','macos-15-intel']
     timeout-minutes: 30
     env:
       CCTOOLS_OUTPUT: ${{ format('cctools-{0}-x86_64-{1}.tar.gz', github.event.inputs.version, matrix.os-name) }}
@@ -181,7 +181,7 @@ jobs:
     runs-on: ${{ matrix.os-name }}
     strategy:
       matrix:
-        os-name: ['macos-14']
+        os-name: ['macos-14', 'macos-15']
     timeout-minutes: 30
     env:
       CCTOOLS_OUTPUT: ${{ format('cctools-{0}-arm64-{1}.tar.gz', github.event.inputs.version, matrix.os-name) }}

batch_job/src/vine_factory.c

@@ -25,7 +25,7 @@ See the file COPYING for details.
 #include "link_auth.h"
 #include "list.h"
 #include "get_line.h"
-#include "getopt.h"
+#include <getopt.h>
 #include "path.h"
 #include "buffer.h"
 #include "rmsummary.h"

batch_job/src/work_queue_factory.c

@@ -25,7 +25,7 @@ See the file COPYING for details.
 #include "link_auth.h"
 #include "list.h"
 #include "get_line.h"
-#include "getopt.h"
+#include <getopt.h>
 #include "path.h"
 #include "buffer.h"
 #include "rmsummary.h"

configure

@@ -825,21 +825,6 @@ fi
 report_detection curl "${curl_avail}" "${config_curl_path}" "${curl_path}"
 
 
-if [ $BUILD_SYS = DARWIN ]
-then
-        if [ -d "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include" ]
-        then
-			ccflags_append_define CCTOOLS_OSX_GETOPT_FROM_SDK
-        else
-                # The version of getopt.h packaged in cctools appears to cause a SIGBUS on Darwin.
-                # Mac OS X Command Line Tools need to be installed to obtain a getopt.h that works.
-                echo "*** Sorry, I can't proceed without Mac OS X Command Line Tools."
-                echo "*** Please refer to the installation instructions."
-                exit 1
-        fi
-fi
-
-
 ### version requirements for swig:
 # at least version 1.3.29 for python 2.4--2.7
 # at least version 2.0.4  for python 3.0--

deltadb/src/catalog_server.c

@@ -11,7 +11,7 @@ See the file COPYING for details.
 #include "datagram.h"
 #include "link.h"
 #include "debug.h"
-#include "getopt.h"
+#include <getopt.h>
 #include "nvpair.h"
 #include "nvpair_jx.h"
 #include "deltadb.h"

deltadb/src/deltadb_query_main.c

@@ -9,7 +9,7 @@
 #include <stdarg.h>
 #include <ctype.h>
 
-#include "getopt.h"
+#include <getopt.h>
 #include "cctools.h"
 #include "jx_parse.h"
 #include "jx_print.h"

devel/confuga/src/confuga_adm.c

@@ -9,7 +9,7 @@ See the file COPYING for details.
 #include "catch.h"
 #include "cctools.h"
 #include "debug.h"
-#include "getopt.h"
+#include <getopt.h>
 #include "random.h"
 
 #include <errno.h>

doc/man/m4/vine_graph_log.m4 doc/man/m4/vine_plot_performance.m4doc/man/m4/vine_graph_log.m4 renamed to doc/man/m4/vine_plot_performance.m4

@@ -1,20 +1,19 @@
 include(manual.h)dnl
-HEADER(vine_graph_log)
+HEADER(vine_plot_performance)
 
 SECTION(NAME)
-BOLD(vine_graph_log) - plots TaskVine performance logs.
+BOLD(vine_plot_performance) - plots TaskVine performance logs.
 
 SECTION(SYNOPSIS)
-CODE(vine_graph_log [options] vine-perf-log)
+CODE(vine_plot_performance [options] vine-perf-log)
 
 SECTION(DESCRIPTION)
 
-BOLD(vine_graph_log) is a script to plot some of the statistics from a
+BOLD(vine_plot_performance) is a script to plot some of the statistics from a
 TaskVine log, as generated by CODE(vine_enable_perf_log) from the C API, or by
-CODE(q.enable_perf_log) from the Python API. It assumes the availability of
-CODE(gnuplot).
+CODE(q.enable_perf_log) from the Python API.
 
-BOLD(vine_graph_log) generates four plots, all with CODE(timestamp) as
+BOLD(vine_plot_performance) generates four plots, all with CODE(timestamp) as
 the independent variable:
 
 CODE(time):
@@ -33,9 +32,8 @@ SECTION(OPTIONS)
 OPTIONS_BEGIN
 OPTION_ARG_SHORT(o,prefix-output)Generate prefix-output.{time,time-log,tasks,tasks-log}.PARAM(output-format). Default is PARAM(work-queue-log).
 OPTION_ARG_SHORT(o,prefix-output)Generate prefix-output.{time,time-log,tasks,tasks-log}.PARAM(output-format). Default is PARAM(work-queue-log).
-OPTION_ARG_SHORT(c,gnuplot-path)Specify the location of the gnuplot executable. Default is gnuplot.
 OPTION_ARG_SHORT(r,range)Range of time to plot, in time units (see -u) from the start of execution. Of the form: min:max, min:, or :max.
-OPTION_ARG_SHORT(T,output-format)Set output format. Default is png. If "text", then the gnuplot scripts are written instead of the images.
+OPTION_ARG_SHORT(T,output-format)Set output format. Default is svg.
 OPTION_ARG_SHORT(u,time-unit)Time scale to output. One of s,m,h or d, for seconds, minutes (default), hours or days.
 OPTION_FLAG_SHORT(h)Show help text.
 OPTIONS_END
@@ -45,37 +43,21 @@ SECTION(EXAMPLES)
 General use:
 
 LONGCODE_BEGIN
-% vine_graph_log mylog
+% vine_plot_performance mylog
 % ls mylog*.png
 mylog.tasks.png mylog.tasks-log.png mylog.time.png mylog.time-log.png
 LONGCODE_END
 
 Plot up to the eleventh hour:
 
 LONGCODE_BEGIN
-% vine_graph_log -u h -r :11 mylog
+% vine_plot_performance -u h -r :11 mylog
 
 LONGCODE_END
 Generate script text:
 
-LONGCODE_BEGIN
-% vine_graph_log -Ttext mylog
-% ls mylog*.gnuplot
-mylog.tasks.png.gnuplot mylog.tasks-log.png.gnuplot mylog.time.png.gnuplot mylog.time-log.png.gnuplot
-LONGCODE_END
-
-Specify gnuplot path:
-
-LONGCODE_BEGIN
-% vine_graph_log -c/some/dir/bin/gnuplot mylog
-LONGCODE_END
-
 SECTION(BUGS)
 
-LIST_BEGIN
-LIST_ITEM(Some formats need a special setup for their gnuplot output terminal. `-T' blindly passes the output format, which may cause gnuplot to fail.)
-LIST_END
-
 SECTION(COPYRIGHT)
 
 COPYRIGHT_BOILERPLATE

doc/man/manual.h

@@ -22,7 +22,7 @@ define(SEE_ALSO_TASK_VINE,
 `LIST_BEGIN
 LIST_ITEM(MANUAL(Cooperative Computing Tools Documentation,"../index.html"))
 LIST_ITEM(MANUAL(TaskVine User Manual,"../taskvine.html"))
-LIST_ITEM(MANPAGE(vine_worker,1) MANPAGE(vine_status,1) MANPAGE(vine_factory,1) MANPAGE(vine_graph_log,1) )
+LIST_ITEM(MANPAGE(vine_worker,1) MANPAGE(vine_status,1) MANPAGE(vine_factory,1) MANPAGE(vine_plot_performance,1) )
 LIST_END')dnl
 dnl
 define(SEE_ALSO_PARROT,

doc/man/md/condor_submit_workers.md

@@ -101,7 +101,7 @@ The Cooperative Computing Tools are Copyright (C) 2022 The University of Notre D
 
 - [Cooperative Computing Tools Documentation]("../index.html")
 - [Work Queue User Manual]("../workqueue.html")
-- [work_queue_worker(1)](work_queue_worker.md) [work_queue_status(1)](work_queue_status.md) [work_queue_factory(1)](work_queue_factory.md) [condor_submit_workers(1)](condor_submit_workers.md) [sge_submit_workers(1)](sge_submit_workers.md) [torque_submit_workers(1)](torque_submit_workers.md) 
+- [work_queue_worker(1)](work_queue_worker.md) [work_queue_status(1)](work_queue_status.md) [work_queue_factory(1)](work_queue_factory.md) [condor_submit_workers(1)](condor_submit_workers.md) [uge_submit_workers(1)](uge_submit_workers.md) [torque_submit_workers(1)](torque_submit_workers.md) 
 
 
 CCTools