From 19e000398c581c7c357779d891b0daa7c909c8be Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 29 Mar 2021 16:09:36 +0200 Subject: [PATCH 1/2] global: Rename server prerequisites to tags --- mxq_daemon.c | 8 ++++---- mxq_daemon.h | 2 +- mxqd.c | 20 ++++++++++---------- mxqd.h | 2 +- mxqd_control.c | 2 +- web/pages/mxq/mxq.in | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/mxq_daemon.c b/mxq_daemon.c index 6e2cc00e..724d8502 100644 --- a/mxq_daemon.c +++ b/mxq_daemon.c @@ -36,7 +36,7 @@ " UNIX_TIMESTAMP(daemon_start) as daemon_start," \ " UNIX_TIMESTAMP(daemon_stop) as daemon_stop," \ " daemon_flags," \ - " prerequisites" + " tags" #undef _to_string #undef status_str @@ -78,7 +78,7 @@ static int bind_result_daemon_fields(struct mx_mysql_bind *result, struct mxq_da res += mx_mysql_bind_var(result, idx++, int64, &(daemon->daemon_stop.tv_sec)); res += mx_mysql_bind_var(result, idx++, int32, &(daemon->daemon_flags)); - res += mx_mysql_bind_var(result, idx++, string, &(daemon->prerequisites)); + res += mx_mysql_bind_var(result, idx++, string, &(daemon->tags)); return res; } @@ -143,7 +143,7 @@ int mxq_daemon_register(struct mx_mysql *mysql, struct mxq_daemon *daemon) " daemon_start = CURRENT_TIMESTAMP()," " daemon_stop = 0," " daemon_flags = ?," - " prerequisites = ?" + " tags = ?" ); if (!stmt) { mx_log_err("mx_mysql_statement_prepare(): %m"); @@ -169,7 +169,7 @@ int mxq_daemon_register(struct mx_mysql *mysql, struct mxq_daemon *daemon) res += mx_mysql_statement_param_bind(stmt, idx++, uint64, &(daemon->daemon_memory_limit_slot_soft)); res += mx_mysql_statement_param_bind(stmt, idx++, uint64, &(daemon->daemon_memory_limit_slot_hard)); res += mx_mysql_statement_param_bind(stmt, idx++, int32, &(daemon->daemon_flags)); - res += mx_mysql_statement_param_bind(stmt, idx++, string, &(daemon->prerequisites)); + res += mx_mysql_statement_param_bind(stmt, idx++, string, &(daemon->tags)); assert(res ==0); diff --git a/mxq_daemon.h b/mxq_daemon.h index d3887012..c1069f46 100644 --- a/mxq_daemon.h +++ b/mxq_daemon.h @@ -48,7 +48,7 @@ struct mxq_daemon { struct timeval daemon_stop; int daemon_flags; - char *prerequisites; + char *tags; }; void mxq_daemon_free_content(struct mxq_daemon *daemon); diff --git a/mxqd.c b/mxqd.c index 02c1f1d3..40160bb9 100644 --- a/mxqd.c +++ b/mxqd.c @@ -813,12 +813,12 @@ int server_init(struct mxq_server *server, int argc, char *argv[]) daemon->daemon_memory_limit_slot_soft = server->memory_limit_slot_soft; daemon->daemon_memory_limit_slot_hard = server->memory_limit_slot_hard; - server->prerequisites=keywordset_new("true"); - keywordset_add(server->prerequisites, server->hostname); - keywordset_add(server->prerequisites, server->hostname_short); - read_hostconfig_retry(server->prerequisites); - read_cpufeatures(server->prerequisites); - daemon->prerequisites = keywordset_get(server->prerequisites); + server->tags=keywordset_new("true"); + keywordset_add(server->tags, server->hostname); + keywordset_add(server->tags, server->hostname_short); + read_hostconfig_retry(server->tags); + read_cpufeatures(server->tags); + daemon->tags = keywordset_get(server->tags); return 0; } @@ -1602,10 +1602,10 @@ void server_free(struct mxq_server *server) mx_flock_free(server->flock); mx_free_null(server->supgid); mx_free_null(server->hostname_short); - if (server->prerequisites) - keywordset_free(server->prerequisites); - if (server->daemon.prerequisites) - free(server->daemon.prerequisites); + if (server->tags) + keywordset_free(server->tags); + if (server->daemon.tags) + free(server->daemon.tags); mx_log_finish(); } diff --git a/mxqd.h b/mxqd.h index bec7fabc..ad038e47 100644 --- a/mxqd.h +++ b/mxqd.h @@ -108,7 +108,7 @@ struct mxq_server { size_t supgid_cnt; gid_t *supgid; - struct keywordset *prerequisites; + struct keywordset *tags; }; diff --git a/mxqd_control.c b/mxqd_control.c index 573a534e..46080c43 100644 --- a/mxqd_control.c +++ b/mxqd_control.c @@ -25,7 +25,7 @@ static int server_is_qualified(struct mxq_server *server, struct mxq_group *grou if (*group->prerequisites != 0) { struct parser_context parser_context = { .input = group->prerequisites, - .tags = server->prerequisites, + .tags = server->tags, .pos=0, .result = 0, }; diff --git a/web/pages/mxq/mxq.in b/web/pages/mxq/mxq.in index 40f4ba87..960a2155 100755 --- a/web/pages/mxq/mxq.in +++ b/web/pages/mxq/mxq.in @@ -519,7 +519,7 @@ sub server_detail { daemon_memory_limit_slot_soft daemon_memory_limit_slot_hard daemon_jobs_running daemon_slots_running daemon_threads_running daemon_memory_used - mtime daemon_start daemon_stop daemon_flags prerequisites + mtime daemon_start daemon_stop daemon_flags tags ); my $sth=$dbh->prepare('SELECT '.join(',',@cols).' FROM mxq_daemon WHERE daemon_id=? LIMIT 1', undef); $sth->execute($daemon_id); @@ -558,7 +558,7 @@ daemon_stop : $o{daemon_stop} daemon_flags : $o{daemon_flags} -prerequisites : $o{prerequisites} +tags : $o{tags} EOF } From 4d577b23b93b345c101e9e49c3456869052f1ec5 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 29 Mar 2021 16:17:54 +0200 Subject: [PATCH 2/2] MXQ bump version --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ab15be67..dd12d47c 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ MXQ_VERSION_MAJOR = 0 -MXQ_VERSION_MINOR = 26 -MXQ_VERSION_PATCH = 6 +MXQ_VERSION_MINOR = 27 +MXQ_VERSION_PATCH = 0 MXQ_VERSION_EXTRA = "beta" -MXQ_VERSIONDATE = 2016 +MXQ_VERSIONDATE = 2021 MXQ_VERSION_GIT := $(shell git describe --long --tags 2>/dev/null)