Skip to content

Commit

Permalink
Merge branch 'fixes'
Browse files Browse the repository at this point in the history 
* fixes:
  make: add LOCALSTATEDIR
  web: show threads in group table and runtime in minutes for completed jobs
  mxq_job: fix memory leak
  mxqd: fix typo in log
  • Loading branch information
@donald
donald committed Oct 26, 2015
2 parents 498c7a7 + 0e1b70d commit 8532364
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 9 deletions.
7 changes: 7 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ LIBEXECDIR = ${EPREFIX}/libexec
DATADIR = ${PREFIX}/share
MANDIR = ${DATADIR}/man
SYSCONFDIR = ${PREFIX}/etc
LOCALSTATEDIR = ${PREFIX}/var

DESTDIR=

Expand All @@ -43,6 +44,11 @@ ifneq (, $(filter /usr /usr/local, ${PREFIX}))
SYSCONFDIR = /etc
endif

### set localstatedir /var if prefix /usr || /usr/local
ifneq (, $(filter /usr /usr/local, ${PREFIX}))
LOCALSTATEDIR = /var
endif

########################################################################

### strip /mxq from SYSCONFDIR if set
Expand Down Expand Up @@ -125,6 +131,7 @@ CFLAGS += -DLIBEXECDIR=\"${LIBEXECDIR}\"
CFLAGS += -DDATADIR=\"${DATADIR}\"
CFLAGS += -DMANDIR=\"${MANDIR}\"
CFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\"
CFLAGS += -DLOCALSTATEDIR=\"${LOCALSTATEDIR}\"
CFLAGS += $(EXTRA_CFLAGS)

########################################################################
Expand Down
1 change: 1 addition & 0 deletions mxq_job.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@ int mxq_load_job_from_group_for_server(struct mx_mysql *mysql, struct mxq_job *m
}
if(res == 1) {
memcpy(mxqjob, &jobs[0], sizeof(*mxqjob));
free(jobs);
break;
}

Expand Down
2 changes: 1 addition & 1 deletion mxqd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,7 @@ unsigned long start_job(struct mxq_group_list *group)
group->group.user_name, group->group.user_uid, group->group.group_id, mxqjob.job_id);

cpuset_init_job(&mxqjob.host_cpu_set,&server->cpu_set_available,&server->cpu_set_running,group->slots_per_job);
cpuset_log(" job assgined cpus: ",&mxqjob.host_cpu_set);
cpuset_log(" job assigned cpus: ",&mxqjob.host_cpu_set);

mx_mysql_disconnect(server->mysql);

Expand Down
18 changes: 10 additions & 8 deletions web/pages/mxq/mxq.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ sub job {

$dbh or db_init();

my $sth=$dbh->prepare('SELECT *,timestampdiff(MINUTE,date_start,now()) as t FROM mxq_job WHERE job_id=? LIMIT 1',undef);
my $sth=$dbh->prepare('SELECT *,timestampdiff(MINUTE,date_start,now()) as t,timestampdiff(MINUTE,date_start,date_end) as t2 FROM mxq_job WHERE job_id=? LIMIT 1',undef);
$sth->execute($job_id);
my %o=%{$sth->fetchrow_hashref('NAME_lc')};

Expand All @@ -326,8 +326,8 @@ sub job {
my $job_stdout=escapeHTML($o{job_stdout});
my $job_stderr=escapeHTML($o{job_stderr});


my $ago = defined $o{t} ? "($o{t} minutes ago)" : '';
my $ago = $job_status_text eq 'RUNNING' && defined $o{t} ? "($o{t} minutes ago)" : '';
my $rt = defined $o{t2} ? "($o{t2} minutes runtime)" : '';

defined $_ or $_='<null>' for values %o;

Expand Down Expand Up @@ -359,7 +359,7 @@ host_slots : $o{host_slots}
date_submit : $o{date_submit}
date_start : $o{date_start} $ago
date_end : $o{date_end}
date_end : $o{date_end} $rt
job_id_new : $o{job_id_new}
job_id_old : $o{job_id_old}
Expand Down Expand Up @@ -397,17 +397,17 @@ sub group_table_rows {
$out.=$q->Tr($q->th($head));

while (my $row=$sth->fetchrow_arrayref()) {
my ($group_id,$group_name,$user_name,$group_mtime,$group_status,
my ($group_id,$group_name,$job_threads,$user_name,$group_mtime,$group_status,
$group_jobs,$group_jobs_inq,$group_jobs_running,$group_jobs_finished,$group_jobs_failed,$group_jobs_cancelled,$group_jobs_unknown
)=@$row;

$out.=$q->Tr(
$q->td({class=>'number'},$q->a({href=>selfurl("/group/$group_id")},$group_id)),
$q->td($group_name),
$q->td({class=>'number'},$job_threads),
$q->td($user_name),
$q->td($group_mtime),
$q->td(group_status($group_status)),

$q->td({class=>'number'},$group_jobs),
$q->td({class=>'number'},$group_jobs_inq),
$q->td({class=>'number'},$group_jobs_running),
Expand All @@ -429,11 +429,11 @@ sub group_table {
my $out;

my @cols=qw(
group_id group_name user_name group_mtime group_status
group_id group_name job_threads user_name group_mtime group_status
group_jobs group_jobs_inq group_jobs_running group_jobs_finished group_jobs_failed group_jobs_cancelled group_jobs_unknown
);
my @head=qw(
group_id group_name user_name group_mtime group_status
group_id group_name threads user_name group_mtime group_status
jobs inq running finished failed cancelled unknown
);

Expand All @@ -447,6 +447,7 @@ sub group_table {
@cols=qw(
group_id
group_name
job_threads
user_name
group_date_end
group_status
Expand All @@ -460,6 +461,7 @@ sub group_table {
@head=qw(
group_id
group_name
threads
user_name
date_end
group_status
Expand Down

0 comments on commit 8532364

Please sign in to comment.