Skip to content

Commit

Permalink
Merge branch 'issues/issue16'
Browse files Browse the repository at this point in the history
bring first commits for
mariux64#16
into master

* issues/issue16:
  mxqd: Kill jobs over memory at most every 60 seconds
  mx_proc: Use pgrp in addition to ppid to group processes
  mxqps: Add new tool to list mxqd processes
  mx_proc: Add process tree related functions
  mx_proc: Move process related function from mx_util to mx_proc
  mxqd: set MXQ_HOSTID in main process
  • Loading branch information
mariux committed Oct 24, 2015
2 parents 1a1c954 + 86dc801 commit 0bcb2fd
Show file tree
Hide file tree
Showing 10 changed files with 747 additions and 168 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ mx_getopt.o
mx_flock.o
mx_log.o
mx_util.o
mx_proc.o
mxqps.o
mxq_group.o
mxqadmin.o
mxqdump.o
Expand All @@ -21,6 +23,7 @@ mxqadmin
mxqdump
mxqkill
mxqd
mxqps
test_mx_util
test_mx_log
test_mx_mysql
Expand Down
28 changes: 28 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,10 @@ mx_log.h += mx_log.h

mx_util.h += mx_util.h

### mx_proc.h ----------------------------------------------------------

mx_proc.h += mx_proc.h

### mx_flock.h ---------------------------------------------------------

mx_flock.h += mx_flock.h
Expand Down Expand Up @@ -309,6 +313,12 @@ mx_util.o: $(mx_log.h)

clean: CLEAN += mx_util.o

### mx_proc ------------------------------------------------------------

mx_proc.o: $(mx_proc.h)

clean: CLEAN += mx_proc.o

### mx_flock.o ---------------------------------------------------------

mx_flock.o: $(mx_flock.h)
Expand Down Expand Up @@ -390,6 +400,7 @@ clean: CLEAN += mxq_job.o
mxqd.o: $(mx_getopt.h)
mxqd.o: $(mx_flock.h)
mxqd.o: $(mx_util.h)
mxqd.o: $(mx_proc.h)
mxqd.o: $(mx_log.h)
mxqd.o: $(mxqd.h)
mxqd.o: $(mxq_group.h)
Expand Down Expand Up @@ -422,6 +433,7 @@ clean: CLEAN += mxqsub.o

mxqd: mx_flock.o
mxqd: mx_util.o
mxqd: mx_proc.o
mxqd: mx_log.o
mxqd: mxq_log.o
mxqd: mx_getopt.o
Expand Down Expand Up @@ -500,6 +512,21 @@ clean: CLEAN += mxqkill
install:: mxqkill
$(call quiet-installforuser,$(SUID_MODE),$(UID_CLIENT),$(GID_CLIENT),mxqkill,${DESTDIR}${BINDIR}/mxqkill)

### mxqps -------------------------------------------------------------

mxqps.o: $(mx_proc.h)
mxqps.o: $(mx_util.h)

clean: CLEAN += mxqps.o

mxqps: mx_log.o
mxqps: mx_util.o
mxqps: mx_proc.o

build: mxqps

clean: CLEAN += mxqps

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

fix: FIX += mxqdctl-hostconfig.sh
Expand Down Expand Up @@ -539,6 +566,7 @@ test_mx_util.o: $(mx_util.h)
clean: CLEAN += test_mx_util.o

test_mx_util: mx_util.o
test_mx_util: mx_proc.o
test_mx_util: mx_log.o
clean: CLEAN += test_mx_util

Expand Down
Loading

0 comments on commit 0bcb2fd

Please sign in to comment.