From 9509e6eb3b23c1b5bb2c4a5e597c0c67a6b1b8f3 Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Mon, 26 Oct 2015 13:09:52 +0100 Subject: [PATCH] mxq_job: Minor cleanup --- mxq_job.c | 54 ++++++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/mxq_job.c b/mxq_job.c index 68fc709..f894f22 100644 --- a/mxq_job.c +++ b/mxq_job.c @@ -23,37 +23,31 @@ " job_flags, " \ " job_priority, " \ " group_id, " \ - \ " job_workdir, " \ " job_argc, " \ " job_argv, " \ " job_stdout, " \ " job_stderr, " \ - \ " job_umask, " \ " host_submit, " \ " host_id, " \ " server_id, " \ " host_hostname, " \ - \ " host_pid, " \ " host_slots, " \ " UNIX_TIMESTAMP(date_submit) as date_submit, " \ " UNIX_TIMESTAMP(date_start) as date_start, " \ " UNIX_TIMESTAMP(date_end) as date_end, " \ - \ " stats_status, " \ " stats_utime_sec, " \ " stats_utime_usec, " \ " stats_stime_sec, " \ " stats_stime_usec, " \ - \ " stats_real_sec, " \ " stats_real_usec, " \ " stats_maxrss, " \ " stats_minflt, " \ " stats_majflt, " \ - \ " stats_nswap, " \ " stats_inblock, " \ " stats_oublock, " \ @@ -73,37 +67,31 @@ static int bind_result_job_fields(struct mx_mysql_bind *result, struct mxq_job * res += mx_mysql_bind_var(result, idx++, uint64, &(j->job_flags)); res += mx_mysql_bind_var(result, idx++, uint16, &(j->job_priority)); res += mx_mysql_bind_var(result, idx++, uint64, &(j->group_id)); - res += mx_mysql_bind_var(result, idx++, string, &(j->job_workdir)); res += mx_mysql_bind_var(result, idx++, uint16, &(j->job_argc)); res += mx_mysql_bind_var(result, idx++, string, &(j->job_argv_str)); res += mx_mysql_bind_var(result, idx++, string, &(j->job_stdout)); res += mx_mysql_bind_var(result, idx++, string, &(j->job_stderr)); - res += mx_mysql_bind_var(result, idx++, uint32, &(j->job_umask)); res += mx_mysql_bind_var(result, idx++, string, &(j->host_submit)); res += mx_mysql_bind_var(result, idx++, string, &(j->host_id)); res += mx_mysql_bind_var(result, idx++, string, &(j->server_id)); res += mx_mysql_bind_var(result, idx++, string, &(j->host_hostname)); - res += mx_mysql_bind_var(result, idx++, uint32, &(j->host_pid)); res += mx_mysql_bind_var(result, idx++, uint32, &(j->host_slots)); res += mx_mysql_bind_var(result, idx++, int64, &(j->date_submit)); res += mx_mysql_bind_var(result, idx++, int64, &(j->date_start)); res += mx_mysql_bind_var(result, idx++, int64, &(j->date_end)); - res += mx_mysql_bind_var(result, idx++, int32, &(j->stats_status)); res += mx_mysql_bind_var(result, idx++, int64, &(j->stats_rusage.ru_utime.tv_sec)); res += mx_mysql_bind_var(result, idx++, int64, &(j->stats_rusage.ru_utime.tv_usec)); res += mx_mysql_bind_var(result, idx++, int64, &(j->stats_rusage.ru_stime.tv_sec)); res += mx_mysql_bind_var(result, idx++, int64, &(j->stats_rusage.ru_stime.tv_usec)); - res += mx_mysql_bind_var(result, idx++, int64, &(j->stats_realtime.tv_sec)); res += mx_mysql_bind_var(result, idx++, int64, &(j->stats_realtime.tv_usec)); res += mx_mysql_bind_var(result, idx++, int64, &(j->stats_rusage.ru_maxrss)); res += mx_mysql_bind_var(result, idx++, int64, &(j->stats_rusage.ru_minflt)); res += mx_mysql_bind_var(result, idx++, int64, &(j->stats_rusage.ru_majflt)); - res += mx_mysql_bind_var(result, idx++, int64, &(j->stats_rusage.ru_nswap)); res += mx_mysql_bind_var(result, idx++, int64, &(j->stats_rusage.ru_inblock)); res += mx_mysql_bind_var(result, idx++, int64, &(j->stats_rusage.ru_oublock)); @@ -457,6 +445,7 @@ int mxq_set_job_status_running(struct mx_mysql *mysql, struct mxq_job *job) int mxq_set_job_status_exited(struct mx_mysql *mysql, struct mxq_job *job) { int res; + int idx; uint16_t newstatus; struct mx_mysql_bind param = {0}; @@ -509,27 +498,28 @@ int mxq_set_job_status_exited(struct mx_mysql *mysql, struct mxq_job *job) res = mx_mysql_bind_init_param(¶m, 20); assert(res == 0); + idx = 0; res = 0; - res += mx_mysql_bind_var(¶m, 0, uint16, &(newstatus)); - res += mx_mysql_bind_var(¶m, 1, int32, &(job->stats_status)); - res += mx_mysql_bind_var(¶m, 2, int64, &(job->stats_rusage.ru_utime.tv_sec)); - res += mx_mysql_bind_var(¶m, 3, int64, &(job->stats_rusage.ru_utime.tv_usec)); - res += mx_mysql_bind_var(¶m, 4, int64, &(job->stats_rusage.ru_stime.tv_sec)); - res += mx_mysql_bind_var(¶m, 5, int64, &(job->stats_rusage.ru_stime.tv_usec)); - res += mx_mysql_bind_var(¶m, 6, int64, &(job->stats_realtime.tv_sec)); - res += mx_mysql_bind_var(¶m, 7, int64, &(job->stats_realtime.tv_usec)); - res += mx_mysql_bind_var(¶m, 8, int64, &(job->stats_rusage.ru_maxrss)); - res += mx_mysql_bind_var(¶m, 9, int64, &(job->stats_rusage.ru_minflt)); - res += mx_mysql_bind_var(¶m, 10, int64, &(job->stats_rusage.ru_majflt)); - res += mx_mysql_bind_var(¶m, 11, int64, &(job->stats_rusage.ru_nswap)); - res += mx_mysql_bind_var(¶m, 12, int64, &(job->stats_rusage.ru_inblock)); - res += mx_mysql_bind_var(¶m, 13, int64, &(job->stats_rusage.ru_oublock)); - res += mx_mysql_bind_var(¶m, 14, int64, &(job->stats_rusage.ru_nvcsw)); - res += mx_mysql_bind_var(¶m, 15, int64, &(job->stats_rusage.ru_nivcsw)); - res += mx_mysql_bind_var(¶m, 16, uint64, &(job->job_id)); - res += mx_mysql_bind_var(¶m, 17, string, &(job->host_hostname)); - res += mx_mysql_bind_var(¶m, 18, string, &(job->server_id)); - res += mx_mysql_bind_var(¶m, 19, uint32, &(job->host_pid)); + res += mx_mysql_bind_var(¶m, idx++, uint16, &(newstatus)); + res += mx_mysql_bind_var(¶m, idx++, int32, &(job->stats_status)); + res += mx_mysql_bind_var(¶m, idx++, int64, &(job->stats_rusage.ru_utime.tv_sec)); + res += mx_mysql_bind_var(¶m, idx++, int64, &(job->stats_rusage.ru_utime.tv_usec)); + res += mx_mysql_bind_var(¶m, idx++, int64, &(job->stats_rusage.ru_stime.tv_sec)); + res += mx_mysql_bind_var(¶m, idx++, int64, &(job->stats_rusage.ru_stime.tv_usec)); + res += mx_mysql_bind_var(¶m, idx++, int64, &(job->stats_realtime.tv_sec)); + res += mx_mysql_bind_var(¶m, idx++, int64, &(job->stats_realtime.tv_usec)); + res += mx_mysql_bind_var(¶m, idx++, int64, &(job->stats_rusage.ru_maxrss)); + res += mx_mysql_bind_var(¶m, idx++, int64, &(job->stats_rusage.ru_minflt)); + res += mx_mysql_bind_var(¶m, idx++, int64, &(job->stats_rusage.ru_majflt)); + res += mx_mysql_bind_var(¶m, idx++, int64, &(job->stats_rusage.ru_nswap)); + res += mx_mysql_bind_var(¶m, idx++, int64, &(job->stats_rusage.ru_inblock)); + res += mx_mysql_bind_var(¶m, idx++, int64, &(job->stats_rusage.ru_oublock)); + res += mx_mysql_bind_var(¶m, idx++, int64, &(job->stats_rusage.ru_nvcsw)); + res += mx_mysql_bind_var(¶m, idx++, int64, &(job->stats_rusage.ru_nivcsw)); + res += mx_mysql_bind_var(¶m, idx++, uint64, &(job->job_id)); + res += mx_mysql_bind_var(¶m, idx++, string, &(job->host_hostname)); + res += mx_mysql_bind_var(¶m, idx++, string, &(job->server_id)); + res += mx_mysql_bind_var(¶m, idx++, uint32, &(job->host_pid)); assert(res == 0); res = mx_mysql_do_statement_noresult_retry_on_fail(mysql, query, ¶m);