From f87e85147c5d14e2f586dd8321fdf82f8795d3df Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Sat, 24 Oct 2015 20:35:05 +0200 Subject: [PATCH 1/8] README: Update mysql section --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6dfb260..93d2632 100644 --- a/README.md +++ b/README.md @@ -32,12 +32,17 @@ bee update mxq ``` ## Initial setup -Definitions of the tables and triggers for the MySQL database can be found in +Definitions of the tables for the MySQL database can be found in [mysql/create_tables.sql](https://github.molgen.mpg.de/mariux64/mxq/blob/master/mysql/create_tables.sql) +and +[mysql/create_trigger.sql](https://github.molgen.mpg.de/mariux64/mxq/blob/master/mysql/create_trigger.sql) Be sure to create those once and check the same [directory for alter_tables*.sql`](https://github.molgen.mpg.de/mariux64/mxq/blob/master/mysql/) files when upgrading. - +``` +mysql [options] [database] Date: Mon, 26 Oct 2015 10:37:08 +0100 Subject: [PATCH 2/8] test_mx_util: Fix renamed function --- test_mx_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_mx_util.c b/test_mx_util.c index 817fbef..06cfe72 100644 --- a/test_mx_util.c +++ b/test_mx_util.c @@ -345,7 +345,7 @@ static void test_mx_strscan(void) assert(pps->ppid == getppid()); assert(pps->state == 'R'); assert(mx_streq(pps->comm, program_invocation_short_name) || mx_streq(pps->comm, "memcheck-amd64-")); - mx_proc_pid_stat_free(pps); + mx_proc_pid_stat_free_content(pps); } static void test_mx_strvec() { From 8b36941f6563f8ad91ab094b4b09627096bdf94f Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Mon, 26 Oct 2015 10:38:00 +0100 Subject: [PATCH 3/8] mx_log: Fix return value of mx_log_printf() --- mx_log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mx_log.c b/mx_log.c index 8ed9588..e9332b3 100644 --- a/mx_log.c +++ b/mx_log.c @@ -87,7 +87,7 @@ int mx_log_printf(const char *fmt, ...) res = fflush(stderr); mx_free_null(msg); - if (len2 != len) + if (len2 != len+1) return -(errno=EIO); if (!res) From 68e8a199a8f1ac925df44c8638cc283b1a98b62d Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Mon, 26 Oct 2015 10:28:05 +0100 Subject: [PATCH 4/8] mx_log: Add mx_logva*() to use va lists when logging --- mx_log.c | 17 +++++++++++++---- mx_log.h | 11 +++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/mx_log.c b/mx_log.c index e9332b3..ba5a8d5 100644 --- a/mx_log.c +++ b/mx_log.c @@ -137,12 +137,11 @@ static int log_log(int level, int loglevel, char *file, unsigned long line, cons return mx_log_printf("%s%s", prefix, msg); } -int mx_log_do(int level, char *file, unsigned long line, const char *func, const char *fmt, ...) +int mx_logva_do(int level, char *file, unsigned long line, const char *func, const char *fmt, va_list ap) { int loglevel; int len; char *msg = NULL; - va_list ap; int res; int preserved_errno = errno; @@ -153,9 +152,7 @@ int mx_log_do(int level, char *file, unsigned long line, const char *func, const return 0; } - va_start(ap, fmt); len = vasprintf(&msg, fmt, ap); - va_end(ap); if (len == -1) { errno = preserved_errno; @@ -173,6 +170,18 @@ int mx_log_do(int level, char *file, unsigned long line, const char *func, const return res; } +int mx_log_do(int level, char *file, unsigned long line, const char *func, const char *fmt, ...) +{ + va_list ap; + int res; + + va_start(ap, fmt); + res = mx_logva_do(level, file, line, func, fmt, ap); + va_end(ap); + + return res; +} + int mx_log_finish(void) { if (mx_log_log) diff --git a/mx_log.h b/mx_log.h index 48c6098..8b17631 100644 --- a/mx_log.h +++ b/mx_log.h @@ -22,6 +22,7 @@ #define MX_LOG_DEBUG MX_LOG_SYSLOG_TO_MXLOG(LOG_DEBUG) /* debug-level messages */ #define mx_log(level, fmt, ...) mx_log_do((level), __FILE__, __LINE__, __func__, (fmt), ##__VA_ARGS__) +#define mx_logva(level, fmt, ap) mx_logva_do((level), __FILE__, __LINE__, __func__, (fmt), (ap)) #define mx_log_fatal(fmt, ...) mx_log(MX_LOG_EMERG, (fmt), ##__VA_ARGS__) #define mx_log_emerg(fmt, ...) mx_log(MX_LOG_EMERG, (fmt), ##__VA_ARGS__) @@ -33,6 +34,16 @@ #define mx_log_info(fmt, ...) mx_log(MX_LOG_INFO, (fmt), ##__VA_ARGS__) #define mx_log_debug(fmt, ...) mx_log(MX_LOG_DEBUG, (fmt), ##__VA_ARGS__) +#define mx_logva_fatal(fmt, ap) mx_log(MX_LOG_EMERG, (fmt), (ap)) +#define mx_logva_emerg(fmt, ap) mx_log(MX_LOG_EMERG, (fmt), (ap)) +#define mx_logva_alert(fmt, ap) mx_log(MX_LOG_ALERT, (fmt), (ap)) +#define mx_logva_crit(fmt, ap) mx_log(MX_LOG_CRIT, (fmt), (ap)) +#define mx_logva_err(fmt, ap) mx_log(MX_LOG_ERR, (fmt), (ap)) +#define mx_logva_warning(fmt, ap) mx_log(MX_LOG_WARNING, (fmt), (ap)) +#define mx_logva_notice(fmt, ap) mx_log(MX_LOG_NOTICE, (fmt), (ap)) +#define mx_logva_info(fmt, ap) mx_log(MX_LOG_INFO, (fmt), (ap)) +#define mx_logva_debug(fmt, ap) mx_log(MX_LOG_DEBUG, (fmt), (ap)) + int mx_log_log(int level, int loglevel, char *file, unsigned long line, const char *func, const char *msg) __attribute__ ((weak)); int mx_log_print(char *msg, size_t len) __attribute__ ((weak)); From bc32b56ee5cc251bfbcad08e9ff1789fce81be93 Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Mon, 26 Oct 2015 10:47:07 +0100 Subject: [PATCH 5/8] README: update install section --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 93d2632..2e3f397 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,11 @@ https://github.com/mariux/mxq ## Installation ### Install using `GNU make` ``` -make make install ``` + +or to specify a prefix: ``` -make PREFIX=... make PREFIX=... [DESTDIR=...] install ``` ### Install using `bee` @@ -26,6 +26,8 @@ make PREFIX=... [DESTDIR=...] install bee init $(bee download git://github.molgen.mpg.de/mariux64/mxq.git) --execute bee update mxq ``` + +or to specify a prefix ``` bee init $(bee download git://github.molgen.mpg.de/mariux64/mxq.git) --prefix=... --execute bee update mxq From b57816c4a72379f967310691984856ecfb555f79 Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Mon, 26 Oct 2015 11:20:13 +0100 Subject: [PATCH 6/8] mxq_log: Use mx_streq() --- mxq_log.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mxq_log.c b/mxq_log.c index d59ffac..77b40b5 100644 --- a/mxq_log.c +++ b/mxq_log.c @@ -8,6 +8,8 @@ #include #include "mx_log.h" +#include "mx_util.h" + #ifndef mx_free_null #include #define mx_free_null(a) do { free((a)); (a) = NULL; } while(0) @@ -42,7 +44,6 @@ static int timetag(char *buf, size_t size) int mx_log_print(char *msg, size_t len) { - int res; char timebuf[1024]; static char *lastmsg = NULL; @@ -61,8 +62,7 @@ int mx_log_print(char *msg, size_t len) return -(errno=EINVAL); if (lastmsg && lastlen == len) { - res = strcmp(msg, lastmsg); - if (res == 0) { + if (mx_streq(msg, lastmsg)) { cnt++; mx_free_null(msg); return 2; From 379116434fe9c9e4f98167d064f7e029741b7e50 Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Mon, 26 Oct 2015 11:40:40 +0100 Subject: [PATCH 7/8] mx_log: Fix typo "ALERT" --- mx_log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mx_log.c b/mx_log.c index ba5a8d5..6a6a5b5 100644 --- a/mx_log.c +++ b/mx_log.c @@ -109,7 +109,7 @@ static int log_log(int level, int loglevel, char *file, unsigned long line, cons prefix = "EMERGENCY: "; break; case MX_LOG_ALERT: - prefix = "AKERT: "; + prefix = "ALERT: "; break; case MX_LOG_CRIT: prefix = "CRITCAL ERROR: "; From e345231577705b9fc94a6c4e39a292bd7fa1b329 Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Mon, 26 Oct 2015 13:54:18 +0100 Subject: [PATCH 8/8] Makefile: Build and run tests by default --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a9f5846..b6b0e80 100644 --- a/Makefile +++ b/Makefile @@ -186,7 +186,7 @@ manpages/%: manpages/%.xml .PHONY: all .PHONY: build -all: build +all: build test .PHONY: devel devel: CFLAGS += -DMXQ_DEVELOPMENT