New upstream version 2.6

diff --git a/CHANGELOG b/CHANGELOG
index 1168d18..a88ef9b 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+========== Changes in 2.6 (unreleased) ====
+
+* Fixed indentation to avoid compiler warnings. No functional change.
+
+* Updated manual page to warn against using -m on a script.
+
 ========== Changes in 2.5 =================
 
 * Added some protection against causing a fork bomb

diff --git a/Makefile b/Makefile
index dd46fc3..cf8b06a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION?=2.5
+VERSION?=2.6
 PREFIX?=/usr
 CFLAGS?=-Wall -O2 -DVERSION=$(VERSION)
 CC?=gcc
@@ -35,5 +35,5 @@ clean:
        $(MAKE) -C test clean
 
 tarball: clean
-       cd .. && tar czf cpulimit-$(VERSION).tar.gz cpulimit-$(VERSION) --exclude=.svn
+       cd .. && tar czf cpulimit-$(VERSION).tar.gz --exclude=.svn cpulimit-$(VERSION) 
        

diff --git a/README b/README
index 5325717..1b1618f 100644 (file)
--- a/README
+++ b/README
@@ -42,11 +42,11 @@ How to compile and install
 Once you have downloaded a copy of LimitCPU building should be fairly
 straight forward. First we unpack the source code
 
-tar zxf cpulimit-2.2.tar.gz
+tar zxf cpulimit-2.6.tar.gz
 
 Then we run the makefile.
 
-cd cpulimit-2.2
+cd cpulimit-2.6
 make
 
 This should produce the executable file "cpulimit". If you would like

diff --git a/TODO b/TODO
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/TODO
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/cpulimit.1 b/cpulimit.1
index d804200..110e518 100644 (file)
--- a/cpulimit.1
+++ b/cpulimit.1
@@ -39,6 +39,9 @@ kill target process instead of throttling its CPU usage
 .TP
 \fB\-m\fR, \fB\-\-monitor\-forks\fR
 watch and throttle child processes of the target process
+Warning: It is usually a bad idea to use this flag on a shell script. The commands
+in the script will each spawn a process which will, in turn, spawn more copies of
+this program to throttle them, bogging down the system.
 .TP
 \fB\-r\fR, \fB\-\-restore\fR
 restore a process killed using the \-k flag.

diff --git a/cpulimit.c b/cpulimit.c
index 145aef4..5f5cc86 100644 (file)
--- a/cpulimit.c
+++ b/cpulimit.c
@@ -232,15 +232,16 @@ int waitforpid(int pid) {
 done:
     if (!quiet)
        printf("Process %d detected\n",pid);
-       //now set high priority, if possible
-       // if (setpriority(PRIO_PROCESS,getpid(),-20)!=0) {
-        /*
-        if ( (nice_lim < INT_MAX) &&
-             (setpriority(PRIO_PROCESS, my_pid, nice_lim) != 0) ) {
-               printf("Warning: cannot renice.\nTo work better you should run this program as root.\n");
-       }
-        */
-       return 0;
+
+    //now set high priority, if possible
+    // if (setpriority(PRIO_PROCESS,getpid(),-20)!=0) {
+    /*
+    if ( (nice_lim < INT_MAX) &&
+         (setpriority(PRIO_PROCESS, my_pid, nice_lim) != 0) ) {
+       printf("Warning: cannot renice.\nTo work better you should run this program as root.\n");
+    }
+    */
+    return 0;
 
 }
 
@@ -337,16 +338,16 @@ int getpidof(const char *process) {
 done:
     if (!quiet)
        printf("Process %d detected\n",pid);
-       //now set high priority, if possible
-       // if (setpriority(PRIO_PROCESS,getpid(),-20)!=0) {
-        /*
-        if ( (nice_lim < INT_MAX) &&
-             (setpriority(PRIO_PROCESS, my_pid, nice_lim) != 0) ) {
-               printf("Warning: cannot renice.\nTo work better you should run this program as root.\n");
-       }
-        */
-       return pid;
 
+    //now set high priority, if possible
+    // if (setpriority(PRIO_PROCESS,getpid(),-20)!=0) {
+    /*
+    if ( (nice_lim < INT_MAX) &&
+         (setpriority(PRIO_PROCESS, my_pid, nice_lim) != 0) ) {
+       printf("Warning: cannot renice.\nTo work better you should run this program as root.\n");
+    }
+    */
+    return pid;
 }
 
 //SIGINT and SIGTERM signal handler
@@ -1193,11 +1194,12 @@ wait_for_process:
                //estimate how much the controlled process is using the cpu in its working interval
                struct cpu_usage cu;
                if (compute_cpu_usage(pid,workingtime,&cu)==-1) {
-            if (!quiet)
+                     if (!quiet)
                        fprintf(stderr,"Process %d dead!\n",pid);
-                       if (lazy) exit(2);
-                       //wait until our process appears
-                       goto wait_for_process;          
+                    if (lazy) 
+                        exit(2);
+                    //wait until our process appears
+                    goto wait_for_process;             
                }
 
                //cpu actual usage of process (range 0-1)