summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Mesnier <mesnier_p@ociweb.com>2011-03-23 03:32:20 +0000
committerPhil Mesnier <mesnier_p@ociweb.com>2011-03-23 03:32:20 +0000
commitf4f627463024fdee5d8a4403577d9bb0f6cc91ec (patch)
tree61807c20f59b41db29d1f29d5c2445bcba15b562
parent33d107e2167613fb86bd92da686a12f336cd47a5 (diff)
downloadATCD-f4f627463024fdee5d8a4403577d9bb0f6cc91ec.tar.gz
Wed Mar 23 03:29:21 UTC 2011 Phil Mesnier <mesnier_p@ociweb.com>
* utils/logWalker/Log.cpp: * utils/logWalker/Session.cpp: * utils/logWalker/Thread.cpp: Unfuzzing.
-rw-r--r--TAO/ChangeLog10
-rw-r--r--TAO/utils/logWalker/Log.cpp8
-rw-r--r--TAO/utils/logWalker/Session.cpp2
-rw-r--r--TAO/utils/logWalker/Thread.cpp2
4 files changed, 15 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c0977cea5c0..68d9846f84a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Mar 23 03:29:21 UTC 2011 Phil Mesnier <mesnier_p@ociweb.com>
+
+ * utils/logWalker/Log.cpp:
+ * utils/logWalker/Session.cpp:
+ * utils/logWalker/Thread.cpp:
+
+ Unfuzzing.
+
Tue Mar 22 22:09:09 UTC 2011 Phil Mesnier <mesnier_p@ociweb.com>
* utils/logWalker/HostProcess.cpp:
@@ -10,7 +18,7 @@ Tue Mar 22 22:09:09 UTC 2011 Phil Mesnier <mesnier_p@ociweb.com>
* utils/logWalker/Thread.h:
* utils/logWalker/Thread.cpp:
* utils/logWalker/logWalker.cpp:
-
+
Incremental improvements to the log walker utility, mostly in
error reporting, also with thread encounter tracking, and source
identification.
diff --git a/TAO/utils/logWalker/Log.cpp b/TAO/utils/logWalker/Log.cpp
index 4e4a311667a..2402d13e690 100644
--- a/TAO/utils/logWalker/Log.cpp
+++ b/TAO/utils/logWalker/Log.cpp
@@ -108,7 +108,7 @@ Log::get_host (long pid)
size_t numprocs = this->procs_.size();
hp = new HostProcess (this->origin_,pid);
this->procs_.insert_tail(hp);
- ACE_CString &procname = this->alias_.length() > 0 ?
+ ACE_CString &procname = this->alias_.length() > 0 ?
this->alias_ : this->origin_;
switch (numprocs)
{
@@ -131,7 +131,7 @@ Log::get_host (long pid)
hp->proc_name(a2);
}
}
-
+
this->session_.add_process(hp);
return hp;
}
@@ -266,7 +266,7 @@ Log::parse_dump_msg (Log *this_, char *line, size_t offset)
break;
}
case 0: // sending request
- thr->enter_wait(pp);
+ thr->enter_wait(pp);
// fall through.
case 3: { // receiving reply
Invocation *inv = pp->find_invocation(rid, thr->active_handle());
@@ -485,7 +485,7 @@ Log::parse_wait_on_read (Log *this_, char *line, size_t offset)
HostProcess *hp = this_->get_host(pid);
Thread *thr = hp == 0 ? 0 : hp->find_thread (tid);
PeerProcess *pp = thr->incoming();
-
+
thr->exit_wait (pp, offset);
}
diff --git a/TAO/utils/logWalker/Session.cpp b/TAO/utils/logWalker/Session.cpp
index 1f6dad776e1..898be5e84c6 100644
--- a/TAO/utils/logWalker/Session.cpp
+++ b/TAO/utils/logWalker/Session.cpp
@@ -40,7 +40,7 @@ Session::set_tao_version (ACE_TCHAR *str)
tao_version_ = 180;
else if (ACE_OS::strncmp (str, ACE_TEXT("2.0"), 3) == 0)
tao_version_ = 200;
- else
+ else
return false;
return true;
}
diff --git a/TAO/utils/logWalker/Thread.cpp b/TAO/utils/logWalker/Thread.cpp
index 9a651816ce3..57345a22447 100644
--- a/TAO/utils/logWalker/Thread.cpp
+++ b/TAO/utils/logWalker/Thread.cpp
@@ -41,7 +41,7 @@ Thread::handle_request (void)
this->nested_++;
}
-void
+void
Thread::enter_wait (PeerProcess *pp)
{
this->pending_.push (pp);