Merge branch 'mxqsub'

* mxqsub: mxq: Remove obsolete mxq.h mxqsub: Improve handling of mysql config defaults mxqsub: Cleanup missing includes and dependencies mxqsub: Remove build dependency to mxq_mysql
mariux · May 21, 2015 · 129852c · 129852c
2 parents 238bf36 + ab0776b
commit 129852c
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 114 deletions.
diff --git a/Makefile b/Makefile
@@ -46,11 +46,14 @@ endif
 
 ##############################################################################
 
-MXQ_MYSQL_DEFAULT_FILE = ${SYSCONFDIR}/mxq/mysql.cnf
+MXQ_MYSQL_DEFAULT_FILE  = ${SYSCONFDIR}/mxq/mysql.cnf
+MXQ_MYSQL_DEFAULT_GROUP = mxqclient
+
 MXQ_INITIAL_PATH = /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
 
-CFLAGS_MXQ_MYSQL_DEFAULT_FILE = -DMXQ_MYSQL_DEFAULT_FILE=\"$(MXQ_MYSQL_DEFAULT_FILE)\"
-CFLAGS_MXQ_INITIAL_PATH       = -DMXQ_INITIAL_PATH=\"$(MXQ_INITIAL_PATH)\"
+CFLAGS_MXQ_MYSQL_DEFAULT_FILE  = -DMXQ_MYSQL_DEFAULT_FILE=\"$(MXQ_MYSQL_DEFAULT_FILE)\"
+CFLAGS_MXQ_MYSQL_DEFAULT_GROUP = -DMXQ_MYSQL_DEFAULT_GROUP=\"$(MXQ_MYSQL_DEFAULT_GROUP)\"
+CFLAGS_MXQ_INITIAL_PATH        = -DMXQ_INITIAL_PATH=\"$(MXQ_INITIAL_PATH)\"
 
 MYSQL_CONFIG = mysql_config
 
@@ -177,12 +180,6 @@ mx_flock.h += mx_flock.h
 mx_mysql.h += mx_mysql.h
 mx_mysql.h += $(mx_util.h)
 
-### mxq.h --------------------------------------------------------------
-
-mxq.h += mxq.h
-mxq.h += $(mxq_group.h)
-mxq.h += $(mxq_job.h)
-
 ### mxq_mysql.h --------------------------------------------------------
 
 mxq_mysql.h += mxq_mysql.h
@@ -192,7 +189,6 @@ mxq_mysql.h += $(mxq_util.h)
 
 mxq_util.h += mxq_util.h
 mxq_util.h += $(mx_log.h)
-mxq_util.h += $(mxq.h)
 
 ### mxq_group.h --------------------------------------------------------
 
@@ -314,7 +310,6 @@ clean: CLEAN += mxq_group.o
 
 mxq_job.o: $(mx_util.h)
 mxq_job.o: $(mx_log.h)
-mxq_job.o: $(mxq.h)
 mxq_job.o: $(mxq_job.h)
 mxq_job.o: $(mxq_group.h)
 mxq_job.o: $(mxq_mysql.h)
@@ -342,13 +337,15 @@ clean: CLEAN += mxqd.o
 ### mxqsub.o -------------------------------------------------------
 
 mxqsub.o: $(mx_getopt.h)
-mxqsub.o: $(mxq_util.h)
 mxqsub.o: $(mx_util.h)
 mxqsub.o: $(mx_log.h)
-mxqsub.o: $(mxq_mysql.h)
 mxqsub.o: $(mx_mysql.h)
+mxqsub.o: $(mxq_group.h)
+mxqsub.o: $(mxq_job.h)
+mxqsub.o: $(mxq_util.h)
 mxqsub.o: CFLAGS += $(CFLAGS_MYSQL)
 mxqsub.o: CFLAGS += $(CFLAGS_MXQ_MYSQL_DEFAULT_FILE)
+mxqsub.o: CFLAGS += $(CFLAGS_MXQ_MYSQL_DEFAULT_GROUP)
 
 clean: CLEAN += mxqsub.o
 
@@ -377,7 +374,6 @@ install:: mxqd
 ### mxqsub ------------------------------------------------------------
 
 mxqsub: mx_getopt.o
-mxqsub: mxq_mysql.o
 mxqsub: mxq_util.o
 mxqsub: mx_util.o
 mxqsub: mx_log.o

diff --git a/mxq.h b/mxq.h
diff --git a/mxq_group.c b/mxq_group.c
@@ -8,6 +8,7 @@
 #include "mx_log.h"
 
 #include "mxq_group.h"
+#include "mxq_job.h"
 #include "mxq_mysql.h"
 
 #define MXQ_GROUP_FIELDS "group_id," \

diff --git a/mxq_job.c b/mxq_job.c
@@ -16,7 +16,6 @@
 #include "mxq_group.h"
 #include "mxq_job.h"
 #include "mxq_mysql.h"
-#include "mxq.h"
 
 #define MXQ_JOB_FIELDS "job_id, " \
                 "job_status, " \

diff --git a/mxq_job.h b/mxq_job.h
@@ -4,6 +4,9 @@
 #include <stdint.h>
 #include <mysql.h>
 
+#include <sys/time.h>
+#include <sys/resource.h>
+
 #include "mxq_group.h"
 
 struct mxq_job {

diff --git a/mxq_job_dump.c b/mxq_job_dump.c
@@ -12,6 +12,9 @@
 #include "mxq_util.h"
 #include "mxq_mysql.h"
 
+#include "mxq_group.h"
+#include "mxq_job.h"
+
 
 struct result {
     struct mxq_job job;

diff --git a/mxq_util.c b/mxq_util.c
@@ -94,14 +94,6 @@ void *realloc_forever(void *ptr, size_t size)
     } while (1);
 }
 
-void mxq_free_job(struct mxq_job_full *job)
-{
-    if (!job)
-        return;
-
-    free(job);
-}
-
 char **strvec_new(void)
 {
     char **strvec;

diff --git a/mxq_util.h b/mxq_util.h
@@ -6,12 +6,8 @@
 #include <string.h>
 #include <mysql.h>
 
-#include "mxq.h"
-
 char *mxq_hostname(void);
 
-void mxq_free_job(struct mxq_job_full *job);
-
 char **stringtostringvec(int argc, char *s);
 char *stringvectostring(int argc, char *argv[]);
 int chrcnt(char *s, char c);

diff --git a/mxqd.c b/mxqd.c
@@ -30,7 +30,6 @@
 #include "mx_util.h"
 #include "mx_log.h"
 
-#include "mxq.h"
 #include "mxq_group.h"
 #include "mxq_job.h"
 #include "mxq_mysql.h"

diff --git a/mxqdump.c b/mxqdump.c
@@ -14,6 +14,8 @@
 #include "mxq_mysql.h"
 #include "mx_getopt.h"
 
+#include "mxq_group.h"
+
 #ifndef MXQ_VERSION
 #define MXQ_VERSION "0.00"
 #endif

diff --git a/mxqkill.c b/mxqkill.c
@@ -22,6 +22,9 @@
 #include "mxq_mysql.h"
 #include "mx_getopt.h"
 
+#include "mxq_group.h"
+#include "mxq_job.h"
+
 #ifndef MXQ_VERSION
 #define MXQ_VERSION "0.00"
 #endif

diff --git a/mxqsub.c b/mxqsub.c
@@ -21,8 +21,17 @@
 
 #include <inttypes.h>
 
+#include <sys/time.h>
+#include <sys/resource.h>
+
+#include <string.h>
+
 #include "mxq_util.h"
 
+#include "mxq_group.h"
+#include "mxq_job.h"
+
+#include "mx_log.h"
 #include "mx_util.h"
 #include "mx_getopt.h"
 #include "mx_mysql.h"
@@ -45,8 +54,18 @@
 #define MXQ_VERSIONDATE "2015"
 #endif
 
-#define MYSQL_DEFAULT_FILE     MXQ_MYSQL_DEFAULT_FILE
-#define MYSQL_DEFAULT_GROUP    "mxqsub"
+#ifndef MXQ_MYSQL_DEFAULT_FILE
+#   define MXQ_MYSQL_DEFAULT_FILE NULL
+#   define MXQ_MYSQL_DEFAULT_FILE_STR "\"MySQL defaults\""
+#else
+#   define MXQ_MYSQL_DEFAULT_FILE_STR MXQ_MYSQL_DEFAULT_FILE
+#endif
+
+#ifndef MXQ_MYSQL_DEFAULT_GROUP
+#   define MXQ_MYSQL_DEFAULT_GROUP     program_invocation_short_name
+#endif
+#define MXQ_MYSQL_DEFAULT_GROUP_STR MXQ_MYSQL_DEFAULT_GROUP
+
 
 static void print_version(void)
 {
@@ -63,7 +82,7 @@ static void print_usage(void)
     printf(
     "\n"
     "Usage:\n"
-    "  mxqsub [mxqsub-options] <command> [command options and arguments ..]\n"
+    "  %s [mxqsub-options] <command> [command options and arguments ..]\n"
     "\n"
     "Synopsis:\n"
     "  queue a job to be executed on a cluster node.\n"
@@ -106,13 +125,16 @@ static void print_usage(void)
     "\n"
     "Change how to connect to the mysql server:\n"
     "\n"
-    "  -M | --mysql-default-file  [mysql-file]   (default: " MYSQL_DEFAULT_FILE ")\n"
-    "  -S | --mysql-default-group [mysql-group]  (default: " MYSQL_DEFAULT_GROUP ")\n"
+    "  -M | --mysql-default-file  [mysql-file]   (default: %s)\n"
+    "  -S | --mysql-default-group [mysql-group]  (default: %s)\n"
     "\n"
     "Environment:\n"
     "  MXQ_MYSQL_DEFAULT_FILE   change default for [mysql-file]\n"
     "  MXQ_MYSQL_DEFAULT_GROUP  change default for [mysql-group]\n"
-    "\n"
+    "\n",
+        program_invocation_short_name,
+        MXQ_MYSQL_DEFAULT_FILE_STR,
+        MXQ_MYSQL_DEFAULT_GROUP_STR
     );
 }
 
@@ -472,11 +494,11 @@ int main(int argc, char *argv[])
 
     arg_mysql_default_group = getenv("MXQ_MYSQL_DEFAULT_GROUP");
     if (!arg_mysql_default_group)
-        arg_mysql_default_group = MYSQL_DEFAULT_GROUP;
+        arg_mysql_default_group = MXQ_MYSQL_DEFAULT_GROUP;
 
     arg_mysql_default_file  = getenv("MXQ_MYSQL_DEFAULT_FILE");
     if (!arg_mysql_default_file)
-        arg_mysql_default_file = MYSQL_DEFAULT_FILE;
+        arg_mysql_default_file = MXQ_MYSQL_DEFAULT_FILE;
 
     /******************************************************************/