summaryrefslogtreecommitdiff
path: root/ace/Remote_Tokens.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ace/Remote_Tokens.cpp')
-rw-r--r--ace/Remote_Tokens.cpp86
1 files changed, 43 insertions, 43 deletions
diff --git a/ace/Remote_Tokens.cpp b/ace/Remote_Tokens.cpp
index 39e9b3bcab6..e5e53cd62a5 100644
--- a/ace/Remote_Tokens.cpp
+++ b/ace/Remote_Tokens.cpp
@@ -68,7 +68,7 @@ ACE_TSS_Connection::make_TSS_TYPE (void) const
return 0;
}
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_TSS_Connection new connection\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TSS_Connection new connection\n")));
return stream;
}
@@ -82,10 +82,10 @@ ACE_TSS_Connection::dump (void) const
{
ACE_TRACE ("ACE_TSS_Connection::dump");
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_TSS_Connection::dump:\n")));
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("server_address_\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TSS_Connection::dump:\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("server_address_\n")));
server_address_.dump ();
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("base:\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n")));
ACE_TSS<ACE_SOCK_Stream>::dump ();
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
}
@@ -101,7 +101,7 @@ ACE_Remote_Token_Proxy::~ACE_Remote_Token_Proxy (void)
}
int
-ACE_Remote_Token_Proxy::open (const ASYS_TCHAR *name,
+ACE_Remote_Token_Proxy::open (const ACE_TCHAR *name,
int ignore_deadlock,
int debug)
{
@@ -125,7 +125,7 @@ ACE_Remote_Token_Proxy::initiate_connection (void)
{
errno = ENOENT;
ACE_ERROR_RETURN ((LM_ERROR,
- ASYS_TEXT ("ACE_Remote_Token_Proxy not open.\n")), -1);
+ ACE_TEXT ("ACE_Remote_Token_Proxy not open.\n")), -1);
}
ACE_SOCK_Stream *peer = ACE_Token_Connections::instance ()->get_connection ();
@@ -143,7 +143,7 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request,
ssize_t length;
if ((length = request.encode (buffer)) == -1)
- ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("encode failed")), -1);
+ ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("encode failed")), -1);
ACE_SOCK_Stream *peer = ACE_Token_Connections::instance ()->get_connection ();
@@ -153,7 +153,7 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request,
// Transmit request via a blocking send.
if (peer->send_n (buffer, length) != length)
- ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("send_n failed")), -1);
+ ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("send_n failed")), -1);
else
{
ACE_Token_Reply reply;
@@ -161,10 +161,10 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request,
// Receive reply via blocking read.
if (peer->recv (&reply, sizeof reply) != sizeof reply)
- ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("recv failed")), -1);
+ ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("recv failed")), -1);
if (reply.decode () == -1)
- ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("decode failed")), -1);
+ ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("decode failed")), -1);
errno = int (reply.errnum ());
if (errno != 0)
@@ -192,14 +192,14 @@ ACE_Remote_Token_Proxy::acquire (int notify,
case EWOULDBLOCK :
// Whoah, we detected wouldblock via the shadow mutex!
if (debug_)
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) shadow: acquire will block, owner is %s\n"),
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) shadow: acquire will block, owner is %s\n"),
this->token_->owner_id ()));
// No error, but would block,
break;
case EDEADLK :
if (debug_)
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) shadow: deadlock detected\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) shadow: deadlock detected\n")));
if (ignore_shadow_deadlock_)
break;
@@ -211,8 +211,8 @@ ACE_Remote_Token_Proxy::acquire (int notify,
default :
ACE_ERROR_RETURN ((LM_ERROR,
- ASYS_TEXT ("(%t) %p shadow acquire failed\n"),
- ASYS_TEXT ("ACE_Remote_Token_Proxy")),
+ ACE_TEXT ("(%t) %p shadow acquire failed\n"),
+ ACE_TEXT ("ACE_Remote_Token_Proxy")),
-1);
}
}
@@ -220,8 +220,8 @@ ACE_Remote_Token_Proxy::acquire (int notify,
ACE_Token_Request request (token_->type (),
this->type (),
ACE_Token_Request::ACQUIRE,
- ASYS_ONLY_MULTIBYTE_STRING (this->name ()),
- ASYS_ONLY_MULTIBYTE_STRING (this->client_id ()),
+ this->name (),
+ this->client_id (),
options);
request.notify (notify);
@@ -231,12 +231,12 @@ ACE_Remote_Token_Proxy::acquire (int notify,
if (result == -1)
{
// Update the local shadow copy.
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("error on remote acquire, releasing shadow mutex.\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("error on remote acquire, releasing shadow mutex.\n")));
ACE_Token_Proxy::release ();
}
else
{
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) acquired %s remotely.\n"), this->name ()));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) acquired %s remotely.\n"), this->name ()));
// Our shadow call may have failed. However, it's still a race
// to the remote server. If we beat the client which holds the
// local token, we need to fix things locally to reflect the
@@ -262,7 +262,7 @@ ACE_Remote_Token_Proxy::tryacquire (void (*sleep_hook)(void *))
// Save/restore errno.
ACE_Errno_Guard error (errno);
ACE_DEBUG ((LM_DEBUG,
- ASYS_TEXT ("shadow try acquire failed\n")));
+ ACE_TEXT ("shadow try acquire failed\n")));
}
return -1;
@@ -271,8 +271,8 @@ ACE_Remote_Token_Proxy::tryacquire (void (*sleep_hook)(void *))
ACE_Token_Request request (token_->type (),
this->type (),
ACE_Token_Request::TRY_ACQUIRE,
- ASYS_ONLY_MULTIBYTE_STRING (this->name ()),
- ASYS_ONLY_MULTIBYTE_STRING (this->client_id ()),
+ this->name (),
+ this->client_id (),
ACE_Synch_Options::synch);
return this->request_reply (request,
@@ -293,15 +293,15 @@ ACE_Remote_Token_Proxy::renew (int requeue_position,
return -1;
else if (debug_)
ACE_DEBUG ((LM_DEBUG,
- ASYS_TEXT ("(%t) shadow: renew would block. owner %s.\n"),
+ ACE_TEXT ("(%t) shadow: renew would block. owner %s.\n"),
this->token_->owner_id ()));
}
ACE_Token_Request request (token_->type (),
this->type (),
ACE_Token_Request::RENEW,
- ASYS_ONLY_MULTIBYTE_STRING (this->name ()),
- ASYS_ONLY_MULTIBYTE_STRING (this->client_id ()),
+ this->name (),
+ this->client_id (),
options);
request.requeue_position (requeue_position);
@@ -316,13 +316,13 @@ ACE_Remote_Token_Proxy::renew (int requeue_position,
ACE_Token_Proxy::release ();
}
ACE_ERROR_RETURN ((LM_ERROR,
- ASYS_TEXT ("%p error on remote renew, releasing shadow mutex.\n"),
- ASYS_TEXT ("ACE_Remote_Token_Proxy")), -1);
+ ACE_TEXT ("%p error on remote renew, releasing shadow mutex.\n"),
+ ACE_TEXT ("ACE_Remote_Token_Proxy")), -1);
}
else
{
if (debug_)
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) renewed %s remotely.\n"), this->name ()));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) renewed %s remotely.\n"), this->name ()));
// Make sure that the local shadow reflects our new ownership.
token_->make_owner (waiter_);
return result;
@@ -337,19 +337,19 @@ ACE_Remote_Token_Proxy::release (ACE_Synch_Options &options)
ACE_Token_Request request (token_->type (),
this->type (),
ACE_Token_Request::RELEASE,
- ASYS_ONLY_MULTIBYTE_STRING (this->name ()),
- ASYS_ONLY_MULTIBYTE_STRING (this->client_id ()),
+ this->name (),
+ this->client_id (),
options);
int result = this->request_reply (request, options);
if (result == 0)
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) released %s remotely.\n"), this->name ()));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) released %s remotely.\n"), this->name ()));
// whether success or failure, we're going to release the shadow.
// If race conditions exist such that we are no longer the owner,
// this release will perform a remove.
if (ACE_Token_Proxy::release () == -1)
- ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%t) shadow: release failed\n")));
+ ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) shadow: release failed\n")));
return result;
}
@@ -365,17 +365,17 @@ void
ACE_Remote_Token_Proxy::token_acquired (ACE_TPQ_Entry *)
{
ACE_TRACE ("ACE_Remote_Token_Proxy::token_acquired");
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) shadow token %s acquired\n"),
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) shadow token %s acquired\n"),
this->client_id (),
this->name ()));
// ACE_Token_Proxy::token_acquired (vp);
}
-const ASYS_TCHAR*
+const ACE_TCHAR*
ACE_Remote_Token_Proxy::owner_id (void)
{
ACE_TRACE ("ACE_Remote_Token_Proxy::owner_id");
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("owner_id called\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_id called\n")));
// @@ special operation
return 0;
}
@@ -385,10 +385,10 @@ ACE_Remote_Token_Proxy::dump (void) const
{
ACE_TRACE ("ACE_Remote_Token_Proxy::owner_id");
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Tokens::dump:\n")
- ASYS_TEXT (" ignore_shadow_deadlock_ = %d\n"),
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Tokens::dump:\n")
+ ACE_TEXT (" ignore_shadow_deadlock_ = %d\n"),
ignore_shadow_deadlock_));
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("base:\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n")));
ACE_Token_Proxy::dump ();
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
}
@@ -398,8 +398,8 @@ ACE_Remote_Mutex::dump (void) const
{
ACE_TRACE ("ACE_Remote_Mutex::dump");
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Remote_Mutex::dump:\n")));
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("base:\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Remote_Mutex::dump:\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n")));
ACE_Remote_Token_Proxy::dump ();
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
}
@@ -409,8 +409,8 @@ ACE_Remote_RLock::dump (void) const
{
ACE_TRACE ("ACE_Remote_RLock::dump");
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Remote_RLock::dump:\n")));
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("base:\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Remote_RLock::dump:\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n")));
ACE_Remote_Token_Proxy::dump ();
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
}
@@ -420,8 +420,8 @@ ACE_Remote_WLock::dump (void) const
{
ACE_TRACE ("ACE_Remote_WLock::dump");
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Remote_WLock::dump:\n")));
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("base:\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Remote_WLock::dump:\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n")));
ACE_Remote_Token_Proxy::dump ();
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
}
View Lorry Controller Status