[SCM] master: Add INFO log-level; use warning level instead of System.out.println.

[cagney@sourceware.org]

The branch, master has been updated
       via  2404d069602dc2b49eb5355039d2ed59c0e1cfb7 (commit)
      from  b5dd83dda5cd506c65914247987c8fef06a6a2b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 2404d069602dc2b49eb5355039d2ed59c0e1cfb7
Author: Andrew Cagney <cagney@redhat.com>
Date:   Thu Mar 13 15:27:22 2008 -0400

    Add INFO log-level; use warning level instead of System.out.println.
    
    frysk-core/frysk/proc/live/ChangeLog
    2008-03-13  Andrew Cagney  <cagney@redhat.com>
    
    	* LinuxPtraceTaskState.java (warning): New; use instead of
    	System.out.println().
    
    frysk-sys/frysk/rsl/ChangeLog
    2008-03-13  Andrew Cagney  <cagney@redhat.com>
    
    	* Log.java (prefixTimeAndPid()): For WARNING/INFO, include level.
    	* LogFactory.java (info(Class)): New.
    	(info(String)): New.
    	* Level.mkenum (INFO): New; make default.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/frysk/proc/live/ChangeLog               |    5 +++++
 .../frysk/proc/live/LinuxPtraceTaskState.java      |   13 +++++++------
 frysk-sys/frysk/rsl/ChangeLog                      |    7 +++++++
 frysk-sys/frysk/rsl/Level.mkenum                   |    9 +++++----
 frysk-sys/frysk/rsl/Log.java                       |    6 ++++++
 frysk-sys/frysk/rsl/LogFactory.java                |    6 ++++++
 6 files changed, 36 insertions(+), 10 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog
index 92bbfd9..a9b6c01 100644
--- a/frysk-core/frysk/proc/live/ChangeLog
+++ b/frysk-core/frysk/proc/live/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-13  Andrew Cagney  <cagney@redhat.com>
+
+	* LinuxPtraceTaskState.java (warning): New; use instead of
+	System.out.println().
+
 2008-03-12  Andrew Cagney  <cagney@redhat.com>
 
 	* LinuxPtraceHost.java (addProc(ProcessIdentifier,LinuxPtraceProc)):
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
index a04daa7..db89997 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
@@ -48,13 +48,15 @@ import java.util.Collection;
 import java.util.Iterator;
 import frysk.sys.Signal;
 import frysk.rsl.Log;
+import frysk.rsl.LogFactory;
 
 /**
  * A Linux Task's State tracked using PTRACE.
  */
 
 class LinuxPtraceTaskState extends State {
-    private static final Log fine = Log.fine(LinuxPtraceTaskState.class);
+    private static final Log fine = LogFactory.fine(LinuxPtraceTaskState.class);
+    private static final Log warning = LogFactory.warning(LinuxPtraceTaskState.class);
 
     LinuxPtraceTaskState(String state) {
 	super(state);
@@ -800,12 +802,11 @@ class LinuxPtraceTaskState extends State {
 						Signal signal) {
 	    if (signal == Signal.STOP) {
 		Collection pendingObservations = task.pendingObservations;
-		// XXX Real stop event! - Do we want observers here?
-		// What state should the task be after being stopped?
 		if (pendingObservations.isEmpty()) {
-		    fine.log("Unhandled real stop event for task", task);
-		    System.out.println("Unhandled real stop event for task: "
-				       + task);
+		    // XXX Real stop event! - Do we want observers
+		    // here?  What state should the task be after
+		    // being stopped?
+		    warning.log("Unexpected stop event for task", task);
 		}
 		Iterator it = pendingObservations.iterator();
 		while (it.hasNext()) {
diff --git a/frysk-sys/frysk/rsl/ChangeLog b/frysk-sys/frysk/rsl/ChangeLog
index e11d8dc..b3c6fb9 100644
--- a/frysk-sys/frysk/rsl/ChangeLog
+++ b/frysk-sys/frysk/rsl/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-13  Andrew Cagney  <cagney@redhat.com>
+
+	* Log.java (prefixTimeAndPid()): For WARNING/INFO, include level.
+	* LogFactory.java (info(Class)): New.
+	(info(String)): New.
+	* Level.mkenum (INFO): New; make default.
+
 2008-03-11  Andrew Cagney  <cagney@redhat.com>
 
 	* TestOptions.java: Use Level.DEFAULT.
diff --git a/frysk-sys/frysk/rsl/Level.mkenum b/frysk-sys/frysk/rsl/Level.mkenum
index 12b539d..e945859 100644
--- a/frysk-sys/frysk/rsl/Level.mkenum
+++ b/frysk-sys/frysk/rsl/Level.mkenum
@@ -1,5 +1,6 @@
 NONE 0
-WARNING|DEFAULT 1
-FINE 2
-FINEST 3
-MAX 4
+WARNING 1
+INFO|DEFAULT 2
+FINE 3
+FINEST 4
+MAX 5
diff --git a/frysk-sys/frysk/rsl/Log.java b/frysk-sys/frysk/rsl/Log.java
index 0d2ec6c..ed3cae0 100644
--- a/frysk-sys/frysk/rsl/Log.java
+++ b/frysk-sys/frysk/rsl/Log.java
@@ -126,6 +126,12 @@ public final class Log {
     private static final long startTime = System.currentTimeMillis();
 
     private void prefixTimeAndPid() {
+	if (level.compareTo(Level.DEFAULT) <= 0) {
+	    // Prefix user visible log messages with the severity; but
+	    // leave it off debugging messages.
+	    out.print(level.toPrint());
+	    out.print(": ");
+	}
 	long time = System.currentTimeMillis() - startTime;
 	long millis = time % 1000;
 	time = time / 1000;
diff --git a/frysk-sys/frysk/rsl/LogFactory.java b/frysk-sys/frysk/rsl/LogFactory.java
index 6bb02f4..3832145 100644
--- a/frysk-sys/frysk/rsl/LogFactory.java
+++ b/frysk-sys/frysk/rsl/LogFactory.java
@@ -60,6 +60,9 @@ public final class LogFactory {
     public static Log warning(String klass) {
 	return get(klass).get(Level.WARNING);
     }
+    public static Log info(String klass) {
+	return get(klass).get(Level.INFO);
+    }
     public static Log fine(String klass) {
 	return get(klass).get(Level.FINE);
     }
@@ -87,6 +90,9 @@ public final class LogFactory {
     public static Log warning(Class klass) {
 	return get(klass).get(Level.WARNING);
     }
+    public static Log info(Class klass) {
+	return get(klass).get(Level.INFO);
+    }
     public static Log fine(Class klass) {
 	return get(klass).get(Level.FINE);
     }


hooks/post-receive
--
frysk system monitor/debugger