Issue 2265: Add additional --taskmastertrace= messages in the Task class.

Refactor messages in the Taskmaster class to use new, common methods.

2 files changed, 94 insertions, 9 deletions

diff --git a/test/Interactive/taskmastertrace.py b/test/Interactive/taskmastertrace.py
index e78bdfa..b274c65 100644
--- a/test/Interactive/taskmastertrace.py
+++ b/test/Interactive/taskmastertrace.py
@@ -75,15 +75,28 @@ scons>>>
 Taskmaster: Looking for a node to evaluate
 Taskmaster:     Considering node <no_state   0   'foo.out'> and its children:
 Taskmaster:        <no_state   0   'foo.in'>
-Taskmaster:      adjusting ref count: <pending    1   'foo.out'>
+Taskmaster:      adjusting ref count: <pending    1   'foo.out'>, child 'foo.in'
 Taskmaster:     Considering node <no_state   0   'foo.in'> and its children:
 Taskmaster: Evaluating <pending    0   'foo.in'>
 
+Task.make_ready_current(): node <pending    0   'foo.in'>
+Task.prepare():      node <up_to_date 0   'foo.in'>
+Task.executed_with_callbacks(): node <up_to_date 0   'foo.in'>
+Task.postprocess():  node <up_to_date 0   'foo.in'>
+Task.postprocess():  removing <up_to_date 0   'foo.in'>
+Task.postprocess():  adjusting parent ref count <pending    0   'foo.out'>
+
 Taskmaster: Looking for a node to evaluate
 Taskmaster:     Considering node <pending    0   'foo.out'> and its children:
 Taskmaster:        <up_to_date 0   'foo.in'>
 Taskmaster: Evaluating <pending    0   'foo.out'>
+
+Task.make_ready_current(): node <pending    0   'foo.out'>
+Task.prepare():      node <executing  0   'foo.out'>
+Task.execute():      node <executing  0   'foo.out'>
 Copy("foo.out", "foo.in")
+Task.executed_with_callbacks(): node <executing  0   'foo.out'>
+Task.postprocess():  node <executed   0   'foo.out'>
 
 Taskmaster: Looking for a node to evaluate
 Taskmaster: No candidate anymore.
diff --git a/test/option/taskmastertrace.py b/test/option/taskmastertrace.py
index a7d583e..cd6e09d 100644
--- a/test/option/taskmastertrace.py
+++ b/test/option/taskmastertrace.py
@@ -53,28 +53,58 @@ Taskmaster:        <no_state   0   'SConstruct'>
 Taskmaster:        <no_state   0   'Tfile.in'>
 Taskmaster:        <no_state   0   'Tfile.mid'>
 Taskmaster:        <no_state   0   'Tfile.out'>
-Taskmaster:      adjusting ref count: <pending    1   '.'>
-Taskmaster:      adjusting ref count: <pending    2   '.'>
-Taskmaster:      adjusting ref count: <pending    3   '.'>
-Taskmaster:      adjusting ref count: <pending    4   '.'>
+Taskmaster:      adjusting ref count: <pending    1   '.'>, child 'SConstruct'
+Taskmaster:      adjusting ref count: <pending    2   '.'>, child 'Tfile.in'
+Taskmaster:      adjusting ref count: <pending    3   '.'>, child 'Tfile.mid'
+Taskmaster:      adjusting ref count: <pending    4   '.'>, child 'Tfile.out'
 Taskmaster:     Considering node <no_state   0   'SConstruct'> and its children:
 Taskmaster: Evaluating <pending    0   'SConstruct'>
 
+Task.make_ready_current(): node <pending    0   'SConstruct'>
+Task.prepare():      node <up_to_date 0   'SConstruct'>
+Task.executed_with_callbacks(): node <up_to_date 0   'SConstruct'>
+Task.postprocess():  node <up_to_date 0   'SConstruct'>
+Task.postprocess():  removing <up_to_date 0   'SConstruct'>
+Task.postprocess():  adjusting parent ref count <pending    3   '.'>
+
 Taskmaster: Looking for a node to evaluate
 Taskmaster:     Considering node <no_state   0   'Tfile.in'> and its children:
 Taskmaster: Evaluating <pending    0   'Tfile.in'>
 
+Task.make_ready_current(): node <pending    0   'Tfile.in'>
+Task.prepare():      node <up_to_date 0   'Tfile.in'>
+Task.executed_with_callbacks(): node <up_to_date 0   'Tfile.in'>
+Task.postprocess():  node <up_to_date 0   'Tfile.in'>
+Task.postprocess():  removing <up_to_date 0   'Tfile.in'>
+Task.postprocess():  adjusting parent ref count <pending    2   '.'>
+
 Taskmaster: Looking for a node to evaluate
 Taskmaster:     Considering node <no_state   0   'Tfile.mid'> and its children:
 Taskmaster:        <up_to_date 0   'Tfile.in'>
 Taskmaster: Evaluating <pending    0   'Tfile.mid'>
+
+Task.make_ready_current(): node <pending    0   'Tfile.mid'>
+Task.prepare():      node <executing  0   'Tfile.mid'>
+Task.execute():      node <executing  0   'Tfile.mid'>
 Copy("Tfile.mid", "Tfile.in")
+Task.executed_with_callbacks(): node <executing  0   'Tfile.mid'>
+Task.postprocess():  node <executed   0   'Tfile.mid'>
+Task.postprocess():  removing <executed   0   'Tfile.mid'>
+Task.postprocess():  adjusting parent ref count <pending    1   '.'>
 
 Taskmaster: Looking for a node to evaluate
 Taskmaster:     Considering node <no_state   0   'Tfile.out'> and its children:
 Taskmaster:        <executed   0   'Tfile.mid'>
 Taskmaster: Evaluating <pending    0   'Tfile.out'>
+
+Task.make_ready_current(): node <pending    0   'Tfile.out'>
+Task.prepare():      node <executing  0   'Tfile.out'>
+Task.execute():      node <executing  0   'Tfile.out'>
 Copy("Tfile.out", "Tfile.mid")
+Task.executed_with_callbacks(): node <executing  0   'Tfile.out'>
+Task.postprocess():  node <executed   0   'Tfile.out'>
+Task.postprocess():  removing <executed   0   'Tfile.out'>
+Task.postprocess():  adjusting parent ref count <pending    0   '.'>
 
 Taskmaster: Looking for a node to evaluate
 Taskmaster:     Considering node <pending    0   '.'> and its children:
@@ -84,6 +114,12 @@ Taskmaster:        <executed   0   'Tfile.mid'>
 Taskmaster:        <executed   0   'Tfile.out'>
 Taskmaster: Evaluating <pending    0   '.'>
 
+Task.make_ready_current(): node <pending    0   '.'>
+Task.prepare():      node <executing  0   '.'>
+Task.execute():      node <executing  0   '.'>
+Task.executed_with_callbacks(): node <executing  0   '.'>
+Task.postprocess():  node <executed   0   '.'>
+
 Taskmaster: Looking for a node to evaluate
 Taskmaster: No candidate anymore.
 
@@ -112,27 +148,57 @@ Taskmaster:        <no_state   0   'SConstruct'>
 Taskmaster:        <no_state   0   'Tfile.in'>
 Taskmaster:        <no_state   0   'Tfile.mid'>
 Taskmaster:        <no_state   0   'Tfile.out'>
-Taskmaster:      adjusting ref count: <pending    1   '.'>
-Taskmaster:      adjusting ref count: <pending    2   '.'>
-Taskmaster:      adjusting ref count: <pending    3   '.'>
-Taskmaster:      adjusting ref count: <pending    4   '.'>
+Taskmaster:      adjusting ref count: <pending    1   '.'>, child 'SConstruct'
+Taskmaster:      adjusting ref count: <pending    2   '.'>, child 'Tfile.in'
+Taskmaster:      adjusting ref count: <pending    3   '.'>, child 'Tfile.mid'
+Taskmaster:      adjusting ref count: <pending    4   '.'>, child 'Tfile.out'
 Taskmaster:     Considering node <no_state   0   'SConstruct'> and its children:
 Taskmaster: Evaluating <pending    0   'SConstruct'>
 
+Task.make_ready_current(): node <pending    0   'SConstruct'>
+Task.prepare():      node <up_to_date 0   'SConstruct'>
+Task.executed_with_callbacks(): node <up_to_date 0   'SConstruct'>
+Task.postprocess():  node <up_to_date 0   'SConstruct'>
+Task.postprocess():  removing <up_to_date 0   'SConstruct'>
+Task.postprocess():  adjusting parent ref count <pending    3   '.'>
+
 Taskmaster: Looking for a node to evaluate
 Taskmaster:     Considering node <no_state   0   'Tfile.in'> and its children:
 Taskmaster: Evaluating <pending    0   'Tfile.in'>
 
+Task.make_ready_current(): node <pending    0   'Tfile.in'>
+Task.prepare():      node <up_to_date 0   'Tfile.in'>
+Task.executed_with_callbacks(): node <up_to_date 0   'Tfile.in'>
+Task.postprocess():  node <up_to_date 0   'Tfile.in'>
+Task.postprocess():  removing <up_to_date 0   'Tfile.in'>
+Task.postprocess():  adjusting parent ref count <pending    2   '.'>
+
 Taskmaster: Looking for a node to evaluate
 Taskmaster:     Considering node <no_state   0   'Tfile.mid'> and its children:
 Taskmaster:        <up_to_date 0   'Tfile.in'>
 Taskmaster: Evaluating <pending    0   'Tfile.mid'>
 
+Task.make_ready_current(): node <pending    0   'Tfile.mid'>
+Task.prepare():      node <executing  0   'Tfile.mid'>
+Task.execute():      node <executing  0   'Tfile.mid'>
+Task.executed_with_callbacks(): node <executing  0   'Tfile.mid'>
+Task.postprocess():  node <executed   0   'Tfile.mid'>
+Task.postprocess():  removing <executed   0   'Tfile.mid'>
+Task.postprocess():  adjusting parent ref count <pending    1   '.'>
+
 Taskmaster: Looking for a node to evaluate
 Taskmaster:     Considering node <no_state   0   'Tfile.out'> and its children:
 Taskmaster:        <executed   0   'Tfile.mid'>
 Taskmaster: Evaluating <pending    0   'Tfile.out'>
 
+Task.make_ready_current(): node <pending    0   'Tfile.out'>
+Task.prepare():      node <executing  0   'Tfile.out'>
+Task.execute():      node <executing  0   'Tfile.out'>
+Task.executed_with_callbacks(): node <executing  0   'Tfile.out'>
+Task.postprocess():  node <executed   0   'Tfile.out'>
+Task.postprocess():  removing <executed   0   'Tfile.out'>
+Task.postprocess():  adjusting parent ref count <pending    0   '.'>
+
 Taskmaster: Looking for a node to evaluate
 Taskmaster:     Considering node <pending    0   '.'> and its children:
 Taskmaster:        <up_to_date 0   'SConstruct'>
@@ -141,6 +207,12 @@ Taskmaster:        <executed   0   'Tfile.mid'>
 Taskmaster:        <executed   0   'Tfile.out'>
 Taskmaster: Evaluating <pending    0   '.'>
 
+Task.make_ready_current(): node <pending    0   '.'>
+Task.prepare():      node <executing  0   '.'>
+Task.execute():      node <executing  0   '.'>
+Task.executed_with_callbacks(): node <executing  0   '.'>
+Task.postprocess():  node <executed   0   '.'>
+
 Taskmaster: Looking for a node to evaluate
 Taskmaster: No candidate anymore.