From f70ac6f04bba1e63219f3ca16eba3bd1ee81f1d9 Mon Sep 17 00:00:00 2001 From: Alexey Avramov Date: Sun, 29 Sep 2019 22:53:51 +0900 Subject: [PATCH] files relocation --- .travis.yml | 4 +- Makefile | 58 ++++++++++--------- nohang => nohang/nohang | 0 .../nohang-desktop.conf | 0 nohang.1 => nohang/nohang.1 | 0 nohang.conf => nohang/nohang.conf | 0 nohang.logrotate => nohang/nohang.logrotate | 0 nohang.service.in => nohang/nohang.service.in | 0 test.conf => nohang/test.conf | 0 oom-sort => tools/oom-sort | 0 oom-sort.1 => tools/oom-sort.1 | 0 psi-monitor => tools/psi-monitor | 0 tools/psi-monitor.1 | 5 ++ psi-top => tools/psi-top | 0 tools/psi-top.1 | 5 ++ 15 files changed, 44 insertions(+), 28 deletions(-) rename nohang => nohang/nohang (100%) rename nohang-desktop.conf => nohang/nohang-desktop.conf (100%) rename nohang.1 => nohang/nohang.1 (100%) rename nohang.conf => nohang/nohang.conf (100%) rename nohang.logrotate => nohang/nohang.logrotate (100%) rename nohang.service.in => nohang/nohang.service.in (100%) rename test.conf => nohang/test.conf (100%) rename oom-sort => tools/oom-sort (100%) rename oom-sort.1 => tools/oom-sort.1 (100%) rename psi-monitor => tools/psi-monitor (100%) create mode 100644 tools/psi-monitor.1 rename psi-top => tools/psi-top (100%) create mode 100644 tools/psi-top.1 diff --git a/.travis.yml b/.travis.yml index 19ed6b7..61a4ace 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ script: - nohang -v - nohang -cc /etc/nohang/nohang.conf - - nohang -cc test.conf + - nohang -cc nohang/test.conf - nohang -p - sudo nohang -p @@ -29,7 +29,7 @@ script: - sudo bash -c "nohang & tail /dev/zero & sleep 20 && pkill python3" - /bin/sleep 60 & - - sudo bash -c "nohang -c test.conf & tail /dev/zero & sleep 30 && pkill python3" + - sudo sh -c "timeout 30 nohang -c nohang/test.conf & tail /dev/zero" - sudo cat /var/log/nohang/nohang.log - sudo make uninstall diff --git a/Makefile b/Makefile index 2eea755..8bab84a 100644 --- a/Makefile +++ b/Makefile @@ -11,29 +11,31 @@ all: install: install -d $(DESTDIR)$(BINDIR) - install -m0755 nohang $(DESTDIR)$(BINDIR)/nohang - install -m0755 oom-sort $(DESTDIR)$(BINDIR)/oom-sort - install -m0755 psi-top $(DESTDIR)$(BINDIR)/psi-top - install -m0755 psi-monitor $(DESTDIR)$(BINDIR)/psi-monitor + install -m0755 nohang/nohang $(DESTDIR)$(BINDIR)/nohang + install -m0755 tools/oom-sort $(DESTDIR)$(BINDIR)/oom-sort + install -m0755 tools/psi-top $(DESTDIR)$(BINDIR)/psi-top + install -m0755 tools/psi-monitor $(DESTDIR)$(BINDIR)/psi-monitor install -d $(DESTDIR)$(CONFDIR)/nohang -git describe --tags --long --dirty > version -install -m0644 version $(DESTDIR)$(CONFDIR)/nohang/version -rm -fv version - install -m0644 nohang.conf $(DESTDIR)$(CONFDIR)/nohang/nohang.conf - install -m0644 nohang.conf $(DESTDIR)$(CONFDIR)/nohang/nohang.conf.default - install -m0644 nohang-desktop.conf $(DESTDIR)$(CONFDIR)/nohang/nohang-desktop.conf + install -m0644 nohang/nohang.conf $(DESTDIR)$(CONFDIR)/nohang/nohang.conf + install -m0644 nohang/nohang.conf $(DESTDIR)$(CONFDIR)/nohang/nohang.conf.default + install -m0644 nohang/nohang-desktop.conf $(DESTDIR)$(CONFDIR)/nohang/nohang-desktop.conf install -d $(DESTDIR)$(CONFDIR)/logrotate.d - install -m0644 nohang.logrotate $(DESTDIR)$(CONFDIR)/logrotate.d/nohang + install -m0644 nohang/nohang.logrotate $(DESTDIR)$(CONFDIR)/logrotate.d/nohang install -d $(DESTDIR)$(MANDIR) - gzip -c nohang.1 > $(DESTDIR)$(MANDIR)/nohang.1.gz - gzip -c oom-sort.1 > $(DESTDIR)$(MANDIR)/oom-sort.1.gz + gzip -c nohang/nohang.1 > $(DESTDIR)$(MANDIR)/nohang.1.gz + gzip -c tools/oom-sort.1 > $(DESTDIR)$(MANDIR)/oom-sort.1.gz + gzip -c tools/psi-top.1 > $(DESTDIR)$(MANDIR)/psi-top.1.gz + gzip -c tools/psi-monitor.1 > $(DESTDIR)$(MANDIR)/psi-monitor.1.gz -install -d $(DESTDIR)$(SYSTEMDUNITDIR) - -sed "s|:TARGET_BIN:|$(BINDIR)|g;s|:TARGET_CONF:|$(CONFDIR)|g" nohang.service.in > nohang.service + -sed "s|:TARGET_BIN:|$(BINDIR)|g;s|:TARGET_CONF:|$(CONFDIR)|g" nohang/nohang.service.in > nohang.service -install -m0644 nohang.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service -rm -fv nohang.service -chcon -t systemd_unit_file_t $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service @@ -41,29 +43,31 @@ install: install-desktop: install -d $(DESTDIR)$(BINDIR) - install -m0755 nohang $(DESTDIR)$(BINDIR)/nohang - install -m0755 oom-sort $(DESTDIR)$(BINDIR)/oom-sort - install -m0755 psi-top $(DESTDIR)$(BINDIR)/psi-top - install -m0755 psi-monitor $(DESTDIR)$(BINDIR)/psi-monitor + install -m0755 nohang/nohang $(DESTDIR)$(BINDIR)/nohang + install -m0755 tools/oom-sort $(DESTDIR)$(BINDIR)/oom-sort + install -m0755 tools/psi-top $(DESTDIR)$(BINDIR)/psi-top + install -m0755 tools/psi-monitor $(DESTDIR)$(BINDIR)/psi-monitor install -d $(DESTDIR)$(CONFDIR)/nohang -git describe --tags --long --dirty > version -install -m0644 version $(DESTDIR)$(CONFDIR)/nohang/version -rm -fv version - install -m0644 nohang-desktop.conf $(DESTDIR)$(CONFDIR)/nohang/nohang.conf - install -m0644 nohang-desktop.conf $(DESTDIR)$(CONFDIR)/nohang/nohang-desktop.conf.default - install -m0644 nohang.conf $(DESTDIR)$(CONFDIR)/nohang/nohang.conf.default + install -m0644 nohang/nohang-desktop.conf $(DESTDIR)$(CONFDIR)/nohang/nohang.conf + install -m0644 nohang/nohang-desktop.conf $(DESTDIR)$(CONFDIR)/nohang/nohang-desktop.conf.default + install -m0644 nohang/nohang.conf $(DESTDIR)$(CONFDIR)/nohang/nohang.conf.default install -d $(DESTDIR)$(CONFDIR)/logrotate.d - install -m0644 nohang.logrotate $(DESTDIR)$(CONFDIR)/logrotate.d/nohang + install -m0644 nohang/nohang.logrotate $(DESTDIR)$(CONFDIR)/logrotate.d/nohang install -d $(DESTDIR)$(MANDIR) - gzip -c nohang.1 > $(DESTDIR)$(MANDIR)/nohang.1.gz - gzip -c oom-sort.1 > $(DESTDIR)$(MANDIR)/oom-sort.1.gz + gzip -c nohang/nohang.1 > $(DESTDIR)$(MANDIR)/nohang.1.gz + gzip -c tools/oom-sort.1 > $(DESTDIR)$(MANDIR)/oom-sort.1.gz + gzip -c tools/psi-top.1 > $(DESTDIR)$(MANDIR)/psi-top.1.gz + gzip -c tools/psi-monitor.1 > $(DESTDIR)$(MANDIR)/psi-monitor.1.gz -install -d $(DESTDIR)$(SYSTEMDUNITDIR) - -sed "s|:TARGET_BIN:|$(BINDIR)|g;s|:TARGET_CONF:|$(CONFDIR)|g" nohang.service.in > nohang.service + -sed "s|:TARGET_BIN:|$(BINDIR)|g;s|:TARGET_CONF:|$(CONFDIR)|g" nohang/nohang.service.in > nohang.service -install -m0644 nohang.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service -rm -fv nohang.service -chcon -t systemd_unit_file_t $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service @@ -79,6 +83,8 @@ uninstall: rm -fv $(DESTDIR)$(BINDIR)/psi-monitor rm -fv $(DESTDIR)$(MANDIR)/nohang.1.gz rm -fv $(DESTDIR)$(MANDIR)/oom-sort.1.gz + rm -fv $(DESTDIR)$(MANDIR)/psi-top.1.gz + rm -fv $(DESTDIR)$(MANDIR)/psi-monitor.1.gz rm -fv $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service rm -fvr $(DESTDIR)$(CONFDIR)/nohang/ rm -fvr $(DESTDIR)$(CONFDIR)/logrotate.d/nohang @@ -91,7 +97,7 @@ systemd: -systemctl status nohang pylint: - -pylint3 -E nohang - -pylint3 -E oom-sort - -pylint3 -E psi-top - -pylint3 -E psi-monitor + -pylint3 -E nohang/nohang + -pylint3 -E tools/oom-sort + -pylint3 -E tools/psi-top + -pylint3 -E tools/psi-monitor diff --git a/nohang b/nohang/nohang similarity index 100% rename from nohang rename to nohang/nohang diff --git a/nohang-desktop.conf b/nohang/nohang-desktop.conf similarity index 100% rename from nohang-desktop.conf rename to nohang/nohang-desktop.conf diff --git a/nohang.1 b/nohang/nohang.1 similarity index 100% rename from nohang.1 rename to nohang/nohang.1 diff --git a/nohang.conf b/nohang/nohang.conf similarity index 100% rename from nohang.conf rename to nohang/nohang.conf diff --git a/nohang.logrotate b/nohang/nohang.logrotate similarity index 100% rename from nohang.logrotate rename to nohang/nohang.logrotate diff --git a/nohang.service.in b/nohang/nohang.service.in similarity index 100% rename from nohang.service.in rename to nohang/nohang.service.in diff --git a/test.conf b/nohang/test.conf similarity index 100% rename from test.conf rename to nohang/test.conf diff --git a/oom-sort b/tools/oom-sort similarity index 100% rename from oom-sort rename to tools/oom-sort diff --git a/oom-sort.1 b/tools/oom-sort.1 similarity index 100% rename from oom-sort.1 rename to tools/oom-sort.1 diff --git a/psi-monitor b/tools/psi-monitor similarity index 100% rename from psi-monitor rename to tools/psi-monitor diff --git a/tools/psi-monitor.1 b/tools/psi-monitor.1 new file mode 100644 index 0000000..262d94f --- /dev/null +++ b/tools/psi-monitor.1 @@ -0,0 +1,5 @@ +.TH psi-monitor 1 + +.SH NAME + +psi-monitor \- PSI metrics monitor diff --git a/psi-top b/tools/psi-top similarity index 100% rename from psi-top rename to tools/psi-top diff --git a/tools/psi-top.1 b/tools/psi-top.1 new file mode 100644 index 0000000..98e646e --- /dev/null +++ b/tools/psi-top.1 @@ -0,0 +1,5 @@ +.TH psi-top 1 + +.SH NAME + +psi-top \- psi-top