mx_daemon: Remove dead code

mariux64 · Feb 21, 2022 · 09da264 · 09da264
1 parent 50a8a3d
commit 09da264
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 167 deletions.
diff --git a/mxq_daemon.c b/mxq_daemon.c
@@ -46,57 +46,6 @@
 #define _to_string(s) #s
 #define status_str(x) _to_string(x)
 
-static int bind_result_daemon_fields(struct mx_mysql_bind *result, struct mxq_daemon *daemon)
-{
-    int res = 0;
-    int idx = 0;
-
-    res = mx_mysql_bind_init_result(result, DAEMON_FIELDS_CNT);
-    assert(res >= 0);
-
-    res += mx_mysql_bind_var(result, idx++, uint32, &(daemon->daemon_id));
-    res += mx_mysql_bind_var(result, idx++, string, &(daemon->daemon_name));
-    res += mx_mysql_bind_var(result, idx++,  uint8, &(daemon->status));
-    res += mx_mysql_bind_var(result, idx++, string, &(daemon->hostname));
-    res += mx_mysql_bind_var(result, idx++, string, &(daemon->mxq_version));
-    res += mx_mysql_bind_var(result, idx++, string, &(daemon->boot_id));
-
-    res += mx_mysql_bind_var(result, idx++, uint64, &(daemon->pid_starttime));
-    res += mx_mysql_bind_var(result, idx++, uint32, &(daemon->daemon_pid));
-
-    res += mx_mysql_bind_var(result, idx++, uint32, &(daemon->daemon_slots));
-    res += mx_mysql_bind_var(result, idx++, uint64, &(daemon->daemon_memory));
-    res += mx_mysql_bind_var(result, idx++, uint64, &(daemon->daemon_maxtime));
-
-    res += mx_mysql_bind_var(result, idx++, uint64, &(daemon->daemon_memory_limit_slot_soft));
-    res += mx_mysql_bind_var(result, idx++, uint64, &(daemon->daemon_memory_limit_slot_hard));
-
-    res += mx_mysql_bind_var(result, idx++, uint32, &(daemon->daemon_jobs_running));
-    res += mx_mysql_bind_var(result, idx++, uint32, &(daemon->daemon_slots_running));
-    res += mx_mysql_bind_var(result, idx++, uint32, &(daemon->daemon_threads_running));
-    res += mx_mysql_bind_var(result, idx++, uint64, &(daemon->daemon_memory_used));
-    res += mx_mysql_bind_var(result, idx++, uint16, &(daemon->gpus_max));
-    res += mx_mysql_bind_var(result, idx++, uint16, &(daemon->gpus_used));
-
-    res += mx_mysql_bind_var(result, idx++,  int64, &(daemon->mtime.tv_sec));
-    res += mx_mysql_bind_var(result, idx++,  int64, &(daemon->daemon_start.tv_sec));
-    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->tags));
-    res += mx_mysql_bind_var(result, idx++, string, &(daemon->prerequisites));
-
-    return res;
-}
-
-void mxq_daemon_free_content(struct mxq_daemon *daemon)
-{
-        mx_free_null(daemon->daemon_name);
-        mx_free_null(daemon->hostname);
-        mx_free_null(daemon->mxq_version);
-        mx_free_null(daemon->boot_id);
-}
-
 int mxq_daemon_register(struct mx_mysql *mysql, struct mxq_daemon *daemon)
 {
     struct mx_mysql_stmt *stmt = NULL;
@@ -363,118 +312,3 @@ int mxq_daemon_update_statistics(struct mx_mysql *mysql, struct mxq_daemon *daem
 
     return res;
 }
-
-int mxq_load_all_daemons(struct mx_mysql *mysql, struct mxq_daemon **daemons)
-{
-    struct mxq_daemon *daemons_tmp = NULL;
-    struct mxq_daemon daemon_buf = {0};
-    struct mx_mysql_bind result = {0};
-    int res;
-
-    assert(mysql);
-    assert(daemons);
-    assert(!(*daemons));
-
-    char *query =
-            "SELECT"
-                DAEMON_FIELDS
-            " FROM"
-                " mxq_daemon";
-
-    res = bind_result_daemon_fields(&result, &daemon_buf);
-    assert(res == 0);
-
-    res = mx_mysql_do_statement(mysql, query, NULL, &result, &daemon_buf, (void **)&daemons_tmp, sizeof(*daemons_tmp));
-    if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
-        return res;
-    }
-
-    *daemons = daemons_tmp;
-    return res;
-}
-
-int mxq_load_running_daemons(struct mx_mysql *mysql, struct mxq_daemon **daemons)
-{
-    struct mxq_daemon *daemons_tmp = NULL;
-    struct mxq_daemon daemon_buf = {0};
-    struct mx_mysql_bind result = {0};
-    int res;
-
-    assert(mysql);
-    assert(daemons);
-    assert(!(*daemons));
-
-    char *query =
-            "SELECT"
-                DAEMON_FIELDS
-            " FROM"
-                " mxq_daemon"
-            " WHERE"
-                " daemon_jobs_runnning > 0"
-              " OR"
-                " daemon_stop = 0";
-
-    res = bind_result_daemon_fields(&result, &daemon_buf);
-    assert(res == 0);
-
-    res = mx_mysql_do_statement(mysql, query, NULL, &result, &daemon_buf, (void **)&daemons_tmp, sizeof(*daemons_tmp));
-    if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
-        return res;
-    }
-
-    *daemons = daemons_tmp;
-    return res;
-}
-
-int mxq_load_running_daemons_by_host_and_name(struct mx_mysql *mysql, struct mxq_daemon **daemons, char *hostname, char *daemon_name)
-{
-    struct mxq_daemon *daemons_tmp = NULL;
-    struct mxq_daemon daemon_buf = {0};
-    struct mx_mysql_bind result = {0};
-    struct mx_mysql_bind param = {0};
-    int res;
-    int idx;
-
-    assert(mysql);
-    assert(daemons);
-    assert(!(*daemons));
-    assert(hostname);
-    assert(daemon_name);
-
-    char *query =
-            "SELECT"
-                DAEMON_FIELDS
-            " FROM"
-                " mxq_daemon"
-            " WHERE"
-                " hostname = ?"
-              " AND"
-                " daemon_name = ?"
-              " AND"
-                " ("
-                    " daemon_jobs_runnning > 0"
-                " OR"
-                    " daemon_stop = 0"
-                " )";
-
-    res = mx_mysql_bind_init_param(&param, 2);
-    assert(res == 0);
-    idx = 0;
-    res = mx_mysql_bind_var(&param, idx++, string, &hostname);
-    res = mx_mysql_bind_var(&param, idx++, string, &daemon_name);
-    assert(res == 0);
-
-    res = bind_result_daemon_fields(&result, &daemon_buf);
-    assert(res == 0);
-
-    res = mx_mysql_do_statement(mysql, query, NULL, &result, &daemon_buf, (void **)&daemons_tmp, sizeof(*daemons_tmp));
-    if (res < 0) {
-        mx_log_err("mx_mysql_do_statement(): %m");
-        return res;
-    }
-
-    *daemons = daemons_tmp;
-    return res;
-}
diff --git a/mxq_daemon.h b/mxq_daemon.h
@@ -54,7 +54,6 @@ struct mxq_daemon {
     uint16_t gpus_used;
 };
 
-void mxq_daemon_free_content(struct mxq_daemon *daemon);
 int mxq_daemon_register(struct mx_mysql *mysql, struct mxq_daemon *daemon);
 int mxq_daemon_mark_crashed(struct mx_mysql *mysql, struct mxq_daemon *daemon);
 int mxq_daemon_update_statistics(struct mx_mysql *mysql, struct mxq_daemon *daemon);