Skip to content

Commit

Permalink
Merge branch 'issues/issue24'
Browse files Browse the repository at this point in the history
closes mariux64#24

* issues/issue24:
  mxqsub: Do not add jobs to closed groups
  mxqdump: Add group_flags to group view
  mxqadmin: Add possibility to close/reopen a group
  • Loading branch information
mariux committed Aug 27, 2015
2 parents 706ae7f + f60599e commit dda6960
Show file tree
Hide file tree
Showing 6 changed files with 454 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ mx_flock.o
mx_log.o
mx_util.o
mxq_group.o
mxqadmin.o
mxqdump.o
mxq_job.o
mxqd.o
Expand All @@ -16,6 +17,7 @@ mx_mysql.o

mxqsub
/mxqsub.1
mxqadmin
mxqdump
mxqkill
mxqd
Expand Down
27 changes: 27 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,18 @@ mxqdump.o: CFLAGS += $(CFLAGS_MYSQL)

clean: CLEAN += mxqdump.o

### mxqadmin.o ----------------------------------------------------------

mxqadmin.o: $(mx_log.h)
mxqadmin.o: $(mx_util.h)
mxqadmin.o: $(mx_mysql.h)
mxqadmin.o: $(mx_getopt.h)
mxqadmin.o: $(mxq.h)
mxqadmin.o: $(mxq_group.h)
mxqadmin.o: CFLAGS += $(CFLAGS_MYSQL)

clean: CLEAN += mxqadmin.o

### mxqkill.o ----------------------------------------------------------

mxqkill.o: $(mx_log.h)
Expand Down Expand Up @@ -433,6 +445,21 @@ clean: CLEAN += mxqdump
install:: mxqdump
$(call quiet-installforuser,$(SUID_MODE),$(UID_CLIENT),$(GID_CLIENT),mxqdump,${DESTDIR}${BINDIR}/mxqdump)

### mxqadmin ------------------------------------------------------------

mxqadmin: mx_log.o
mxqadmin: mx_mysql.o
mxqadmin: mx_util.o
mxqadmin: mx_getopt.o
mxqadmin: LDLIBS += $(LDLIBS_MYSQL)

build: mxqadmin

clean: CLEAN += mxqadmin

install:: mxqadmin
$(call quiet-installforuser,$(SUID_MODE),$(UID_CLIENT),$(GID_CLIENT),mxqadmin,${DESTDIR}${BINDIR}/mxqadmin)

### mxqkill ------------------------------------------------------------

mxqkill: mx_log.o
Expand Down
2 changes: 2 additions & 0 deletions mxq_group.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ struct mxq_group {
#define MXQ_GROUP_STATUS_OK 0
#define MXQ_GROUP_STATUS_CANCELLED 99

#define MXQ_GROUP_FLAG_CLOSED (1<<0)

void mxq_group_free_content(struct mxq_group *g);

inline uint64_t mxq_group_jobs_done(struct mxq_group *g);
Expand Down
Loading

0 comments on commit dda6960

Please sign in to comment.