From 59e9bc25fd3795be029062a69d3d42b37d2e1a9a Mon Sep 17 00:00:00 2001 From: Niclas Hofmann Date: Thu, 26 Aug 2021 14:56:49 +0200 Subject: [PATCH 1/2] Fix long option for -g by removing old stuff --group-id was former used for --group-name. That prohibited the use of --group-id for -g. --- mxqsub.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/mxqsub.c b/mxqsub.c index 595a98c7..898bf286 100644 --- a/mxqsub.c +++ b/mxqsub.c @@ -731,9 +731,7 @@ int main(int argc, char *argv[]) MX_OPTION_NO_ARG("help", 'h'), MX_OPTION_NO_ARG("version", 'V'), - MX_OPTION_REQUIRED_ARG("group_id", 1), MX_OPTION_REQUIRED_ARG("group_priority", 2), - MX_OPTION_REQUIRED_ARG("group-id", 3), MX_OPTION_REQUIRED_ARG("time", 4), MX_OPTION_NO_ARG("debug", 5), @@ -868,12 +866,6 @@ int main(int argc, char *argv[]) } break; - case 1: - case 3: - if (opt == 3) - mx_log_warning("option --group-id is deprecated (usage will change in next version). Using --group-name instead."); - else - mx_log_warning("option --group_id is deprecated. Using --group-name instead."); case 'N': if (!(*optctl.optarg)) { mx_log_crit("--group-name '%s': String is empty.", optctl.optarg); From 32fd00d8f34c12c211d92841f3b9f133b76a99ce Mon Sep 17 00:00:00 2001 From: Niclas Hofmann Date: Thu, 26 Aug 2021 15:05:43 +0200 Subject: [PATCH 2/2] Rename --threads long option of -j to --processors --- mxqsub.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mxqsub.c b/mxqsub.c index 898bf286..73d2d025 100644 --- a/mxqsub.c +++ b/mxqsub.c @@ -65,7 +65,7 @@ static void print_usage(void) " Scheduling is done based on the resources a job needs and\n" " on the priority given to the job.\n" "\n" - " -j, --threads=NUMBER set number of threads (default: 1)\n" + " -j, --processors=NUMBER set number of processors (default: 1)\n" " -m, --memory=SIZE set amount of memory (default: 2G)\n" " --tmpdir=SIZE set size of MXQ_JOB_TMPDIR (default: 0)\n" " --blacklist=STRING set list of blacklisted servers (default: '')\n" @@ -754,7 +754,8 @@ int main(int argc, char *argv[]) MX_OPTION_REQUIRED_ARG("umask", 'u'), MX_OPTION_REQUIRED_ARG("priority", 'p'), - MX_OPTION_REQUIRED_ARG("threads", 'j'), + MX_OPTION_REQUIRED_ARG("threads", 1), + MX_OPTION_REQUIRED_ARG("processors", 'j'), MX_OPTION_REQUIRED_ARG("memory", 'm'), MX_OPTION_REQUIRED_ARG("runtime", 't'), @@ -896,9 +897,10 @@ int main(int argc, char *argv[]) } break; + case 1: case 'j': if (mx_strtou16(optctl.optarg, &arg_threads) < 0) { - mx_log_crit("--threads '%s': %m", optctl.optarg); + mx_log_crit("--processors '%s': %m", optctl.optarg); exit(EX_CONFIG); } break;