summaryrefslogtreecommitdiff
path: root/ACE
diff options
context:
space:
mode:
Diffstat (limited to 'ACE')
-rw-r--r--ACE/ChangeLog13
-rw-r--r--ACE/ace/Barrier.cpp3
-rw-r--r--ACE/ace/Dynamic_Service_Base.cpp19
-rw-r--r--ACE/ace/Hash_Map_Manager_T.cpp6
-rw-r--r--ACE/ace/Malloc.cpp3
-rw-r--r--ACE/ace/Malloc_T.cpp6
-rw-r--r--ACE/ace/Mutex.cpp2
-rw-r--r--ACE/ace/Pipe.cpp3
-rw-r--r--ACE/ace/Semaphore.cpp2
-rw-r--r--ACE/ace/TSS_T.cpp6
10 files changed, 39 insertions, 24 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index fb2ffd53fa5..5ea00507c84 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,16 @@
+Fri Jan 30 15:02:08 UTC 2009 Marcel Smit <msmit@remedy.nl>
+
+ * ace/Barrier.cpp:
+ * ace/Dynamic_Service_Base.cpp:
+ * ace/Hash_Map_Manager_T.cpp:
+ * ace/Malloc.cpp:
+ * ace/Malloc_T.cpp:
+ * ace/Mutex.cpp:
+ * ace/Pipe.cpp:
+ * ace/Semaphore.cpp:
+ * ace/TSS_T.cpp:
+ Removed some unnecessary ACE_DEBUG statements.
+
Fri Jan 30 12:55:52 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/run_test.lst:
diff --git a/ACE/ace/Barrier.cpp b/ACE/ace/Barrier.cpp
index 2cb82dba5b6..eac2da3179b 100644
--- a/ACE/ace/Barrier.cpp
+++ b/ACE/ace/Barrier.cpp
@@ -31,8 +31,7 @@ ACE_Sub_Barrier::dump (void) const
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
this->barrier_finished_.dump ();
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("running_threads_ = %d"), this->running_threads_));
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("running_threads_ = %d\n"), this->running_threads_));
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
#endif /* ACE_HAS_DUMP */
}
diff --git a/ACE/ace/Dynamic_Service_Base.cpp b/ACE/ace/Dynamic_Service_Base.cpp
index e93dde6e905..6f3d3225e95 100644
--- a/ACE/ace/Dynamic_Service_Base.cpp
+++ b/ACE/ace/Dynamic_Service_Base.cpp
@@ -82,17 +82,22 @@ ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo,
{
ACE_Guard <ACE_Log_Msg> log_guard (*ACE_Log_Msg::instance ());
- ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT ("ACE (%P|%t) DSB::instance, repo=%@, name=%s")
- ACE_TEXT (" type=%@ => %@"),
- repo->repo_, name, type, obj));
-
if (repo->repo_ != repo_found->repo_)
- ACE_DEBUG ((LM_DEBUG,
+ {
+ ACE_DEBUG ((LM_DEBUG,
+ ACE_TEXT ("ACE (%P|%t) DSB::instance, repo=%@, name=%s")
+ ACE_TEXT (" type=%@ => %@")
ACE_TEXT (" [in repo=%@]\n"),
+ repo->repo_, name, type, obj,
repo_found->repo_));
+ }
else
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+ {
+ ACE_DEBUG ((LM_DEBUG,
+ ACE_TEXT ("ACE (%P|%t) DSB::instance, repo=%@, name=%s")
+ ACE_TEXT (" type=%@ => %@\n"),
+ repo->repo_, name, type, obj));
+ }
}
return obj;
diff --git a/ACE/ace/Hash_Map_Manager_T.cpp b/ACE/ace/Hash_Map_Manager_T.cpp
index aa22bfaacbb..e89ad2d2ef1 100644
--- a/ACE/ace/Hash_Map_Manager_T.cpp
+++ b/ACE/ace/Hash_Map_Manager_T.cpp
@@ -92,8 +92,8 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump
{
#if defined (ACE_HAS_DUMP)
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("total_size_ = %d"), this->total_size_));
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("total_size_ = %d\n"), this->total_size_));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("cur_size_ = %d\n"), this->cur_size_));
this->table_allocator_->dump ();
this->entry_allocator_->dump ();
this->lock_.dump ();
@@ -239,7 +239,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::bind_
&this->table_[loc]);
this->table_[loc].next_ = entry;
entry->next_->prev_ = entry;
- this->cur_size_++;
+ ++this->cur_size_;
return 0;
}
else
diff --git a/ACE/ace/Malloc.cpp b/ACE/ace/Malloc.cpp
index 9c6da58fb0a..ce6a235b820 100644
--- a/ACE/ace/Malloc.cpp
+++ b/ACE/ace/Malloc.cpp
@@ -145,10 +145,9 @@ ACE_Control_Block::ACE_Name_Node::dump (void) const
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("pointer = %@"), (const char *) this->pointer_));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %@"), (ACE_Name_Node *) this->next_));
ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT ("\nname_ = (%@, %s)"),
+ ACE_TEXT ("\nname_ = (%@, %C)\n"),
(const char *) this->name_,
(const char *) this->name_));
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
#endif /* ACE_HAS_DUMP */
}
diff --git a/ACE/ace/Malloc_T.cpp b/ACE/ace/Malloc_T.cpp
index 7e5b222d6f7..d0918128180 100644
--- a/ACE/ace/Malloc_T.cpp
+++ b/ACE/ace/Malloc_T.cpp
@@ -1055,8 +1055,7 @@ ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
this->curr_->dump ();
this->guard_.dump ();
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %s"), this->name_));
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %C\n"), this->name_));
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
#endif /* ACE_HAS_DUMP */
}
@@ -1150,8 +1149,7 @@ ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
this->curr_->dump ();
this->guard_.dump ();
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %s"), this->name_));
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %s\n"), this->name_));
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
#endif /* ACE_HAS_DUMP */
}
diff --git a/ACE/ace/Mutex.cpp b/ACE/ace/Mutex.cpp
index 406c1b3ed1c..2595aaba65e 100644
--- a/ACE/ace/Mutex.cpp
+++ b/ACE/ace/Mutex.cpp
@@ -22,6 +22,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Mutex)
void
ACE_Mutex::dump (void) const
{
+#if defined (ACE_HAS_DUMP)
// ACE_TRACE ("ACE_Mutex::dump");
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -31,6 +32,7 @@ ACE_Mutex::dump (void) const
#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
}
ACE_Mutex::ACE_Mutex (int type, const ACE_TCHAR *name,
diff --git a/ACE/ace/Pipe.cpp b/ACE/ace/Pipe.cpp
index e1a8c1586eb..7e187f285a0 100644
--- a/ACE/ace/Pipe.cpp
+++ b/ACE/ace/Pipe.cpp
@@ -29,8 +29,7 @@ ACE_Pipe::dump (void) const
ACE_TRACE ("ACE_Pipe::dump");
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handles_[0] = %d"), this->handles_[0]));
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhandles_[1] = %d"), this->handles_[1]));
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhandles_[1] = %d\n"), this->handles_[1]));
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
#endif /* ACE_HAS_DUMP */
}
diff --git a/ACE/ace/Semaphore.cpp b/ACE/ace/Semaphore.cpp
index 06de81756ed..104d2e517f0 100644
--- a/ACE/ace/Semaphore.cpp
+++ b/ACE/ace/Semaphore.cpp
@@ -20,11 +20,13 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Semaphore)
void
ACE_Semaphore::dump (void) const
{
+#if defined (ACE_HAS_DUMP)
// ACE_TRACE ("ACE_Semaphore::dump");
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
}
ACE_Semaphore::ACE_Semaphore (unsigned int count,
diff --git a/ACE/ace/TSS_T.cpp b/ACE/ace/TSS_T.cpp
index d5d4ef4a7e5..50bd097b2dc 100644
--- a/ACE/ace/TSS_T.cpp
+++ b/ACE/ace/TSS_T.cpp
@@ -72,8 +72,7 @@ ACE_TSS<TYPE>::dump (void) const
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
this->keylock_.dump ();
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %d\n"), this->key_));
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nonce_ = %d"), this->once_));
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nonce_ = %d\n"), this->once_));
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
#endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) */
#endif /* ACE_HAS_DUMP */
@@ -357,8 +356,7 @@ ACE_TSS_Guard<ACE_LOCK>::dump (void) const
// ACE_TRACE ("ACE_TSS_Guard<ACE_LOCK>::dump");
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %d"), this->key_));
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %d\n"), this->key_));
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
#endif /* ACE_HAS_DUMP */
}
View Lorry Controller Status