This is the mail archive of the
frysk-cvs@sources.redhat.com
mailing list for the frysk project.
[SCM] master: Switching to StopEventLoopWhenProcTerminated.
- From: cagney at sourceware dot org
- To: frysk-cvs at sourceware dot org
- Date: 13 Mar 2008 19:44:14 -0000
- Subject: [SCM] master: Switching to StopEventLoopWhenProcTerminated.
- Reply-to: frysk at sourceware dot org
The branch, master has been updated
via da5b7c5879878f20054299b104ef714de870994c (commit)
via 55c226e2c8afbcaa76a535f46a5926e14b4ecce6 (commit)
via 50432ca6389283fb9315e9000e0a1fe184c22d4c (commit)
from 2404d069602dc2b49eb5355039d2ed59c0e1cfb7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit da5b7c5879878f20054299b104ef714de870994c
Author: Andrew Cagney <cagney@redhat.com>
Date: Thu Mar 13 15:43:17 2008 -0400
Switching to StopEventLoopWhenProcTerminated.
frysk-core/frysk/proc/live/ChangeLog
2008-03-13 Andrew Cagney <cagney@redhat.com>
* TestTaskObserverBlocked.java: Use
StopEventLoopWhenProcTerminated.
commit 55c226e2c8afbcaa76a535f46a5926e14b4ecce6
Author: Andrew Cagney <cagney@redhat.com>
Date: Thu Mar 13 15:26:05 2008 -0400
frysk-core/frysk/proc/ChangeLog
2008-03-13 Andrew Cagney <cagney@redhat.com>
* TestProcGet.java: Use StopEventLoopWhenProcTerminated.
commit 50432ca6389283fb9315e9000e0a1fe184c22d4c
Author: Andrew Cagney <cagney@redhat.com>
Date: Thu Mar 13 13:45:49 2008 -0400
frysk-top/ChangeLog
2008-03-13 Andrew Cagney <cagney@redhat.com>
* Makefile.am (UPLOAD, UPLOAD_FLAGS): Define; include --chmod
option and comment about --perms.
(upload-manpages, upload-javadoc): Use.
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/proc/ChangeLog | 4 ++
frysk-core/frysk/proc/TestProcGet.java | 4 +-
frysk-core/frysk/proc/live/ChangeLog | 3 +
.../frysk/proc/live/TestTaskObserverBlocked.java | 11 ++--
frysk-top/ChangeLog | 6 ++
frysk-top/Makefile.am | 56 +++++++++++---------
6 files changed, 51 insertions(+), 33 deletions(-)
First 500 lines of diff:
diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog
index f3ef4ee..bad283d 100644
--- a/frysk-core/frysk/proc/ChangeLog
+++ b/frysk-core/frysk/proc/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-13 Andrew Cagney <cagney@redhat.com>
+
+ * TestProcGet.java: Use StopEventLoopWhenProcTerminated.
+
2008-03-12 Andrew Cagney <cagney@redhat.com>
* Host.java (observableTaskRemovedXXX): Delete.
diff --git a/frysk-core/frysk/proc/TestProcGet.java b/frysk-core/frysk/proc/TestProcGet.java
index 40abde8..f70c16d 100644
--- a/frysk-core/frysk/proc/TestProcGet.java
+++ b/frysk-core/frysk/proc/TestProcGet.java
@@ -48,7 +48,7 @@ import java.util.Iterator;
import java.util.List;
import frysk.testbed.TearDownFile;
import frysk.testbed.TestLib;
-import frysk.testbed.StopEventLoopWhenProcRemoved;
+import frysk.testbed.StopEventLoopWhenProcTerminated;
import frysk.testbed.DaemonBlockedAtEntry;
import frysk.testbed.ExecOffspring;
import frysk.testbed.ExecCommand;
@@ -76,7 +76,7 @@ public class TestProcGet
"/dev/null"
});
- new StopEventLoopWhenProcRemoved(child);
+ new StopEventLoopWhenProcTerminated(child);
// Grab the AUXV from the process sitting at its entry point.
Auxv[] auxv = child.getMainTask().getProc().getAuxv();
assertNotNull("captured AUXV", auxv);
diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog
index a9b6c01..ce3c3ee 100644
--- a/frysk-core/frysk/proc/live/ChangeLog
+++ b/frysk-core/frysk/proc/live/ChangeLog
@@ -1,5 +1,8 @@
2008-03-13 Andrew Cagney <cagney@redhat.com>
+ * TestTaskObserverBlocked.java: Use
+ StopEventLoopWhenProcTerminated.
+
* LinuxPtraceTaskState.java (warning): New; use instead of
System.out.println().
diff --git a/frysk-core/frysk/proc/live/TestTaskObserverBlocked.java b/frysk-core/frysk/proc/live/TestTaskObserverBlocked.java
index 8695532..8bf1db5 100644
--- a/frysk-core/frysk/proc/live/TestTaskObserverBlocked.java
+++ b/frysk-core/frysk/proc/live/TestTaskObserverBlocked.java
@@ -42,7 +42,7 @@ package frysk.proc.live;
import frysk.rsl.Log;
import frysk.testbed.SignalWaiter;
import frysk.testbed.TestLib;
-import frysk.testbed.StopEventLoopWhenProcRemoved;
+import frysk.testbed.StopEventLoopWhenProcTerminated;
import frysk.testbed.Fibonacci;
import frysk.testbed.TaskSet;
import frysk.testbed.TaskObserverBase;
@@ -525,15 +525,14 @@ public class TestTaskObserverBlocked extends TestLib {
// An object that, when the child process exits, both sets
// a flag to record that event, and requests that the
// event loop stop.
- StopEventLoopWhenProcRemoved childRemoved
- = new StopEventLoopWhenProcRemoved(child);
+ StopEventLoopWhenProcTerminated childRemoved
+ = new StopEventLoopWhenProcTerminated(child);
// Repeatedly run the event loop until the child exits
// (every time there is a spawn the event loop will stop).
int spawnCount = 0;
int loopCount = 0;
- while (loopCount <= fib.getCallCount() && ! childRemoved.p)
- {
+ while (loopCount <= fib.getCallCount() && ! childRemoved.terminated) {
loopCount++;
assertRunUntilStop("run \"fibonacci\" until stop, number "
+ spawnCount + " of " + fib.getCallCount());
@@ -548,7 +547,7 @@ public class TestTaskObserverBlocked extends TestLib {
addedCount());
assertEquals("number of times spawnObserver deleted", 0, deletedCount());
assertEquals("Number of spawns", fib.getCallCount() - 1, spawnCount);
- assertTrue("child exited", childRemoved.p);
+ assertTrue("child exited", childRemoved.terminated);
assertTrue("at least two iterations of the spawn loop", loopCount > 2);
}
}
diff --git a/frysk-top/ChangeLog b/frysk-top/ChangeLog
index 5dc948b..9f8f315 100644
--- a/frysk-top/ChangeLog
+++ b/frysk-top/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-13 Andrew Cagney <cagney@redhat.com>
+
+ * Makefile.am (UPLOAD, UPLOAD_FLAGS): Define; include --chmod
+ option and comment about --perms.
+ (upload-manpages, upload-javadoc): Use.
+
2008-03-13 Mark Wielaard <mwielaard@redhat.com>
* Makefile.am (upload-manpages): New .PHONY target using rsync.
diff --git a/frysk-top/Makefile.am b/frysk-top/Makefile.am
index 072b926..4cecd2b 100644
--- a/frysk-top/Makefile.am
+++ b/frysk-top/Makefile.am
@@ -162,42 +162,48 @@ javadoc: all
-subpackages frysk:lib:inua:jline:junit:gnu \
; \
done
-
-# Since javadoc re-generates all the files, changing their
-# last-modified time (even when the contents don't change), rsync-a
-# must push a mod-time on every file. Avoid that cost by ignoring the
-# mod-time and instead using --checksum; while pulling all the
-# checksums is expensive it isn't as expensive as pushing every file's
-# mod-time.
-
-.PHONY: upload-javadoc
-upload-javadoc:
- rsync \
- --fuzzy \
+
+UPLOAD_FLAGS = --fuzzy \
--delete-during \
--ignore-times \
- --perms \
- --checksum \
--recursive \
--links \
--itemize-changes \
- --stats \
+ --stats
+
+# Since the documentation generation process re-generates all the
+# files, changing their last-modified time (even when the contents
+# don't change), rsync-a is forced to upload a mod-time on every file.
+# Avoid that cost by ignoring the mod-time and instead using
+# --checksum; while pulling all the checksums is expensive it isn't as
+# expensive as pushing every file's mod-time.
+
+UPLOAD_FLAGS += --checksum
+
+# Explicitly specify the file permissions using --chmod. This ensures
+# that uploaded files are group writable so that others can do
+# updates; and directories are SGID so that group membership
+# propogates down (fixed in later rsync releases). Also explicitly
+# specify --perms so that the --chmod permission is used, and not
+# overwriden by the remote remote UMASK (this can also lead to
+# permission denied warnings when trying to set the permission of
+# directories you don't own, just live with that).
+
+UPLOAD_FLAGS += --chmod ug=rwX,o=rX,Dg+s --perms
+
+UPLOAD = echo "Don't worry too much about directory permission warnings" ; \
+ rsync $(UPLOAD_FLAGS)
+
+.PHONY: upload-javadoc
+upload-javadoc:
+ $(UPLOAD) \
javadoc/public javadoc/private \
sourceware.org:/sourceware/www/sourceware/htdocs/frysk/javadoc
CLEANFILES += javadoc
.PHONY: upload-manpages
upload-manpages:
- rsync \
- --fuzzy \
- --delete-during \
- --ignore-times \
- --perms \
- --checksum \
- --recursive \
- --links \
- --itemize-changes \
- --stats \
+ $(UPLOAD) \
manpages/ \
sourceware.org:/sourceware/www/sourceware/htdocs/frysk/manpages
hooks/post-receive
--
frysk system monitor/debugger