summaryrefslogtreecommitdiff
path: root/ACE/ace/Token_Manager.cpp
diff options
context:
space:
mode:
authorhuangh <huangh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2013-04-11 15:50:32 +0000
committerhuangh <huangh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2013-04-11 15:50:32 +0000
commit537046fb5253868dbf1cb8573b00f1f3d5a9ded4 (patch)
tree8883300dd00120bdad85bf01b021d2cf11266119 /ACE/ace/Token_Manager.cpp
parenta0494dd88fb991669c545b629a4d052b098c36d2 (diff)
downloadATCD-537046fb5253868dbf1cb8573b00f1f3d5a9ded4.tar.gz
Thu Apr 11 15:45:41 UTC 2013 Huang-Ming Huang <huangh@ociweb.com>
Diffstat (limited to 'ACE/ace/Token_Manager.cpp')
-rw-r--r--ACE/ace/Token_Manager.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/ACE/ace/Token_Manager.cpp b/ACE/ace/Token_Manager.cpp
index 0487ac8f67f..8a8ef449399 100644
--- a/ACE/ace/Token_Manager.cpp
+++ b/ACE/ace/Token_Manager.cpp
@@ -153,8 +153,8 @@ ACE_Token_Manager::check_deadlock (ACE_Tokens *token, ACE_Token_Proxy *proxy)
// The caller is an owner, so we have a deadlock situation.
if (debug_)
{
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Deadlock detected.\n")));
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s owns %s and is waiting for %s.\n"),
+ ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Deadlock detected.\n")));
+ ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%s owns %s and is waiting for %s.\n"),
proxy->client_id (),
token->name (),
proxy->token_->name ()));
@@ -175,7 +175,7 @@ ACE_Token_Manager::check_deadlock (ACE_Tokens *token, ACE_Token_Proxy *proxy)
{
if (debug_)
{
- ACE_DEBUG ((LM_DEBUG,
+ ACELIB_DEBUG ((LM_DEBUG,
ACE_TEXT ("%s owns %s and is waiting for %s.\n"),
e->client_id (),
token->name (),
@@ -231,7 +231,7 @@ ACE_Token_Manager::release_token (ACE_Tokens *&token)
// we did not find one in the collection
{
errno = ENOENT;
- ACE_ERROR ((LM_ERROR, ACE_TEXT ("Token Manager could not release %s:%d\n"),
+ ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Token Manager could not release %s:%d\n"),
token->name (), token->type ()));
// @@ bad
}
@@ -257,13 +257,13 @@ ACE_Token_Manager::dump (void) const
{
#if defined (ACE_HAS_DUMP)
ACE_TRACE ("ACE_Token_Manager::dump");
- ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Manager::dump:\n")));
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("lock_\n")));
+ ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+ ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Manager::dump:\n")));
+ ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("lock_\n")));
lock_.dump ();
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("collection_\n")));
+ ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("collection_\n")));
collection_.dump ();
- ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+ ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
#endif /* ACE_HAS_DUMP */
}