diff options
Diffstat (limited to 'netsvcs')
25 files changed, 503 insertions, 594 deletions
diff --git a/netsvcs/Makefile.am b/netsvcs/Makefile.am index f3d559265e8..5bebeb4ea44 100644 --- a/netsvcs/Makefile.am +++ b/netsvcs/Makefile.am @@ -1,15 +1,17 @@ -## Process this file with automake to create Makefile.in +##--------------------------------------------------------------------------- +## $Id$ +## +## Makefile for the ACE network services ## -## $Id$ +##--------------------------------------------------------------------------- + ## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. +## Process this file with automake to create Makefile.in ## -## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu SUBDIRS = \ - lib \ - clients \ - servers + lib \ + clients \ + servers +EXTRA_DIST = ACE-netsvcs.html diff --git a/netsvcs/clients/Logger/Makefile.am b/netsvcs/clients/Logger/Makefile.am index 962adef1494..70449c5e220 100644 --- a/netsvcs/clients/Logger/Makefile.am +++ b/netsvcs/clients/Logger/Makefile.am @@ -1,45 +1,24 @@ -## Process this file with automake to create Makefile.in +##---------------------------------------------------------------------------- +## $Id$ ## -## $Id$ +## Makefile for client logging applications +##---------------------------------------------------------------------------- + ## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. +## Process this file with automake to create Makefile.in ## -## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu - -ACE_BUILDDIR = $(top_builddir) - -## Makefile.direct_logging.am -noinst_PROGRAMS = direct_logging - -direct_logging_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(ACE_BUILDDIR) - -direct_logging_SOURCES = \ - direct_logging.cpp - -direct_logging_LDADD = \ - $(top_builddir)/netsvcs/lib/libnetsvcs.la $(top_builddir)/ace/libACE.la -## Makefile.indirect_logging.am -noinst_PROGRAMS += indirect_logging +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -indirect_logging_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(ACE_BUILDDIR) +## LDFLAGS = +## Libtool will automatically link against the "proper" library. +## Do not change the "libACE.la." It is not a typographical error! +LDADD = $(top_builddir)/ace/libACE.la -indirect_logging_SOURCES = \ - indirect_logging.cpp +noinst_PROGRAMS = \ + direct_logging \ + indirect_logging -indirect_logging_LDADD = \ - $(top_builddir)/netsvcs/lib/libnetsvcs.la $(top_builddir)/ace/libACE.la +direct_logging_SOURCES = direct_logging.cpp -## Clean up template repositories, etc. -clean-local: - -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core - -rm -f gcctemp.c gcctemp so_locations - -rm -rf ptrepository SunWS_cache Templates.DB +indirect_logging_SOURCES = indirect_logging.cpp diff --git a/netsvcs/clients/Makefile.am b/netsvcs/clients/Makefile.am index 595f146924e..6edac17be3d 100644 --- a/netsvcs/clients/Makefile.am +++ b/netsvcs/clients/Makefile.am @@ -1,14 +1,14 @@ -## Process this file with automake to create Makefile.in +##---------------------------------------------------------------------------- +## $Id$ ## -## $Id$ +## Makefile for the client programs that test the ACE network services +##---------------------------------------------------------------------------- + ## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. +## Process this file with automake to create Makefile.in ## -## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu SUBDIRS = \ - Logger \ - Naming - + Logger \ + Naming \ + Tokens diff --git a/netsvcs/clients/Naming/Client/Client_Test.cpp b/netsvcs/clients/Naming/Client/Client_Test.cpp index 0f87432d246..ce3e2942219 100644 --- a/netsvcs/clients/Naming/Client/Client_Test.cpp +++ b/netsvcs/clients/Naming/Client/Client_Test.cpp @@ -381,7 +381,7 @@ Client_Test::set_proc_local (void) { // Close down original name space NAMING_CONTEXT ()->close (); - this->name_options_->nameserver_host (ACE_TEXT ("localhost")); + this->name_options_->nameserver_host ("localhost"); this->name_options_->context (ACE_Naming_Context::PROC_LOCAL); return NAMING_CONTEXT ()->open (ACE_Naming_Context::PROC_LOCAL); } @@ -391,7 +391,7 @@ Client_Test::set_node_local (void) { // Close down original name space NAMING_CONTEXT ()->close (); - this->name_options_->nameserver_host (ACE_TEXT ("localhost")); + this->name_options_->nameserver_host ("localhost"); this->name_options_->context (ACE_Naming_Context::NODE_LOCAL); return NAMING_CONTEXT ()->open (ACE_Naming_Context::NODE_LOCAL); } @@ -404,7 +404,7 @@ Client_Test::set_host (const char *hostname, int port) this->name_options_->context (ACE_Naming_Context::NET_LOCAL); // Set Name Options - this->name_options_->nameserver_host (ACE_TEXT_CHAR_TO_TCHAR (hostname)); + this->name_options_->nameserver_host (hostname); this->name_options_->nameserver_port (port); return NAMING_CONTEXT ()->open (ACE_Naming_Context::NET_LOCAL); diff --git a/netsvcs/clients/Naming/Client/Makefile.am b/netsvcs/clients/Naming/Client/Makefile.am index c1e6cfc66ac..95879536177 100644 --- a/netsvcs/clients/Naming/Client/Makefile.am +++ b/netsvcs/clients/Naming/Client/Makefile.am @@ -1,50 +1,31 @@ -## Process this file with automake to create Makefile.in +##---------------------------------------------------------------------------- +## $Id$ ## -## $Id$ +## Makefile for the client programs that test the ACE network services +##---------------------------------------------------------------------------- + ## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. +## Process this file with automake to create Makefile.in ## -## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu - -ACE_BUILDDIR = $(top_builddir) - -## Makefile.Netsvsc_Client_Test_Lib.am -noinst_LTLIBRARIES = libClient_Test.la - -libClient_Test_la_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(ACE_BUILDDIR) \ - -DACE_CLIENT_TEST_BUILD_DLL -libClient_Test_la_SOURCES = \ - Client_Test.cpp +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -libClient_Test_la_LIBADD = \ - $(top_builddir)/ace/libACE.la +noinst_LIBRARIES = libClient_Test.a -noinst_HEADERS = \ - Client_Test.h +libClient_Test_a_SOURCES = Client_Test.cpp Client_Test.h -## Makefile.Netsvcs_Client_Test.am -noinst_PROGRAMS = main +noinst_PROGRAMS = \ + main -main_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(ACE_BUILDDIR) +main_SOURCES = main.cpp +main_LDADD = libClient_Test.a \ + $(top_builddir)/ace/libACE.la -main_SOURCES = \ - main.cpp \ - Client_Test.h +noinst_DATA = svc.conf svc2.conf -main_LDADD = \ - libClient_Test.la $(top_builddir)/ace/libACE.la +EXTRA_DIST = $(noinst_DATA) ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core - -rm -f gcctemp.c gcctemp so_locations - -rm -rf ptrepository SunWS_cache Templates.DB + -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations diff --git a/netsvcs/clients/Naming/Client/main.cpp b/netsvcs/clients/Naming/Client/main.cpp index 25a87893d27..75456ba8cad 100644 --- a/netsvcs/clients/Naming/Client/main.cpp +++ b/netsvcs/clients/Naming/Client/main.cpp @@ -12,7 +12,7 @@ ACE_RCSID(Client, main, "$Id$") int -ACE_TMAIN (int, ACE_TCHAR *argv[]) +main (int, char *argv[]) { ACE_Service_Config daemon; ACE_ARGV new_args; @@ -20,13 +20,13 @@ ACE_TMAIN (int, ACE_TCHAR *argv[]) // Load the existing <argv> into our new one. new_args.add (argv); // Enable loading of static services. - new_args.add (ACE_TEXT ("-y")); + new_args.add ("-y"); // Enable debugging within dynamically linked services. - new_args.add (ACE_TEXT ("-d")); + new_args.add ("-d"); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("argc = %d\n"), - new_args.argc ())); + ACE_TEXT (new_args.argc ()))); // Print the contents of the combined <ACE_ARGV>. for (int i = 0; i < new_args.argc (); i++) @@ -39,23 +39,25 @@ ACE_TMAIN (int, ACE_TCHAR *argv[]) new_args.argv ()) == -1) { if (errno != ENOENT) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")), - 1); + ACE_ERROR ((LM_ERROR, + "%p\n%a", + "open", + 1)); else // Use static binding. { ACE_ARGV args; args.add (argv[0]); - args.add (ACE_TEXT ("-p10011")); // Port number. + args.add ("-p10011"); // Port number. ACE_Service_Object *so = ACE_SVC_INVOKE (ACE_Naming_Context); if (so->init (args.argc (), args.argv ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Naming_Context")), - 1); + ACE_ERROR ((LM_ERROR, + "%p\n%a", + "ACE_Naming_Context", + 1)); so = ACE_SVC_INVOKE (Client_Test); diff --git a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp index bfda59cd09f..f9a765d605e 100644 --- a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp +++ b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp @@ -16,7 +16,7 @@ ACE_RCSID(Dump_Restore, Dump_Restore, "$Id$") -Dump_Restore::Dump_Restore (int argc, ACE_TCHAR *argv[]) +Dump_Restore::Dump_Restore (int argc, char *argv[]) : infile_ (0) { ACE_NEW (this->ns_context_, @@ -28,12 +28,12 @@ Dump_Restore::Dump_Restore (int argc, ACE_TCHAR *argv[]) //determine name context if (ACE_OS::strcmp (this->name_options_->nameserver_host (), - ACE_TEXT ("localhost")) == 0) + "localhost") == 0) { if (ns_context_->open (ACE_Naming_Context::PROC_LOCAL) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ns_context_->open"))); + "%p\n", + "ns_context_->open")); } else { @@ -46,8 +46,8 @@ Dump_Restore::Dump_Restore (int argc, ACE_TCHAR *argv[]) if (this->ns_context_->open (ACE_Naming_Context::NET_LOCAL) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ns_context_->open"))); + "%p\n", + "ns_context_->open")); } this->display_menu (); @@ -56,8 +56,8 @@ Dump_Restore::Dump_Restore (int argc, ACE_TCHAR *argv[]) ACE_Reactor::instance (), ACE_Thread_Manager::instance ()) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("register_stdin_handler"))); + "%p\n", + "register_stdin_handler")); } Dump_Restore::~Dump_Restore (void) @@ -80,7 +80,7 @@ Dump_Restore::handle_input (ACE_HANDLE) if (::scanf ("%s", option) <= 0) { ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("try again\n"))); + "try again\n")); return 0; } @@ -98,7 +98,7 @@ Dump_Restore::handle_input (ACE_HANDLE) case 'h' : if (::scanf ("%s %hu", buf1, &port) <= 0) break; - set_host (ACE_TEXT_CHAR_TO_TCHAR (buf1), port); + set_host (buf1, port); break; case 'F': case 'f': @@ -131,7 +131,7 @@ Dump_Restore::handle_input (ACE_HANDLE) quit (); break; default : - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Unrecognized command.\n"))); + ACE_DEBUG ((LM_DEBUG, "Unrecognized command.\n")); } display_menu (); @@ -142,59 +142,59 @@ void Dump_Restore::display_menu (void) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\n"))); + "\n")); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Name Service Main Menu\n"))); + "Name Service Main Menu\n")); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("----------------------\n"))); + "----------------------\n")); // Check if using local name space or remote name space if (ACE_OS::strcmp (this->name_options_->nameserver_host (), - ACE_TEXT ("localhost")) == 0) + "localhost") == 0) { if (this->ns_scope_ == ACE_Naming_Context::PROC_LOCAL) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (" *** Using Process Local Database ***\n\n"))); + " *** Using Process Local Database ***\n\n")); else ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (" *** Using Node Local Database ***\n\n"))); + " *** Using Node Local Database ***\n\n")); } else { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (" Hostname: %s\n"), + " Hostname: %s\n", this->hostname_)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (" Port Number: %d\n"), + " Port Number: %d\n", this->port_)); } if (this->infile_) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Input File: %C\n"), + "Input File: %s\n", this->filename_)); else ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("** No Input File Specified **\n"))); + "** No Input File Specified **\n")); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("<P> Use Process Local Database\n"))); + "<P> Use Process Local Database\n")); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("<N> Use Node Local Database\n"))); + "<N> Use Node Local Database\n")); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("<H> Set Remote Name server <host> and <port>\n"))); + "<H> Set Remote Name server <host> and <port>\n")); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("<F> Set Input File <file name>\n"))); + "<F> Set Input File <file name>\n")); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("<B> Bind\n"))); + "<B> Bind\n")); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("<U> Unbind\n"))); + "<U> Unbind\n")); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("<R> Rebind\n"))); + "<R> Rebind\n")); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("<D> Dump <file name>\n"))); + "<D> Dump <file name>\n")); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("<Q> or ^C (exit) \n"))); + "<Q> or ^C (exit) \n")); } @@ -202,7 +202,7 @@ int Dump_Restore::set_proc_local (void) { // Set Name Options - this->name_options_->nameserver_host (ACE_TEXT ("localhost")); + this->name_options_->nameserver_host ("localhost"); this->name_options_->nameserver_port (0); // Set Naming Context scope @@ -219,8 +219,8 @@ Dump_Restore::set_proc_local (void) if (this->ns_context_->open (ACE_Naming_Context::PROC_LOCAL) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ns_context_->open")), + "%p\n", + "ns_context_->open"), -1); return 0; @@ -230,7 +230,7 @@ int Dump_Restore::set_node_local (void) { // Set Name Options - this->name_options_->nameserver_host (ACE_TEXT ("localhost")); + this->name_options_->nameserver_host ("localhost"); this->name_options_->nameserver_port (0); // Set Naming Context scope @@ -246,14 +246,14 @@ Dump_Restore::set_node_local (void) if (ns_context_->open (ACE_Naming_Context::NODE_LOCAL) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ns_context_->open")), + "%p\n", + "ns_context_->open"), -1); return 0; } int -Dump_Restore::set_host (const ACE_TCHAR *hostname, +Dump_Restore::set_host (const char *hostname, int port) { // Set Name Options @@ -262,9 +262,11 @@ Dump_Restore::set_host (const ACE_TCHAR *hostname, // Don't really need to do this but it's a hack to fix the problme // of Display () not printing the right hostname - ACE_OS::strcpy (this->hostname_, hostname); + ACE_OS::strcpy (this->hostname_, + hostname); this->port_ = port; - this->ns_scope_ = ACE_Naming_Context::NET_LOCAL; + this->ns_scope_ = + ACE_Naming_Context::NET_LOCAL; // remove old naming context delete this->ns_context_; @@ -277,8 +279,8 @@ Dump_Restore::set_host (const ACE_TCHAR *hostname, // assume net_local context if (ns_context_->open (ACE_Naming_Context::NET_LOCAL) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ns_context_->open")), + "%p\n", + "ns_context_->open"), -1); return 0; } @@ -380,8 +382,8 @@ Dump_Restore::populate (Dump_Restore::Operation_Type op) break; default: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("populate")), + "%p\n", + "populate"), -1); /* NOTREACHED */ } @@ -403,15 +405,15 @@ Dump_Restore::bind (const char *key, type); if (result == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ns_context_->bind")), + "%p\n", + "ns_context_->bind"), -1); else if (result == 1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%s%s%s\n"), - ACE_TEXT ("key <"), + "%s%s%s\n", + "key <", key, - ACE_TEXT ("> already bound")), + "> already bound"), 1); return 0; } @@ -423,8 +425,8 @@ Dump_Restore::unbind (const char *key) if (result == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ns_context_->unbind")), + "%p\n", + "ns_context_->unbind"), -1); return 0; } @@ -438,8 +440,8 @@ Dump_Restore::rebind (const char *key, value, type) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ns_context_->rebind")), + "%p\n", + "ns_context_->rebind"), -1); return 0; } diff --git a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h index 1cdd2113f8e..72651ff6ad0 100644 --- a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h +++ b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h @@ -21,7 +21,7 @@ public: UNBIND, REBIND }; - Dump_Restore (int argc, ACE_TCHAR *argv[]); + Dump_Restore (int argc, char *argv[]); // Initialize name options and naming context ~Dump_Restore (void); @@ -32,7 +32,7 @@ public: void dump (void); private: - ACE_TCHAR hostname_[MAXHOSTNAMELEN + 1]; + char hostname_[MAXHOSTNAMELEN + 1]; // Cache the hostname and port number for remote case void display_menu (void); @@ -44,7 +44,7 @@ private: int set_node_local (void); // Set options to use NODE_LOCAL naming context. - int set_host (const ACE_TCHAR *hostname, + int set_host (const char *hostname, int port); // Set options to use NET_LOCAL naming context specifying host name // and port number. diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile.am b/netsvcs/clients/Naming/Dump_Restore/Makefile.am index cc5dfd0c1c7..22a196c18fb 100644 --- a/netsvcs/clients/Naming/Dump_Restore/Makefile.am +++ b/netsvcs/clients/Naming/Dump_Restore/Makefile.am @@ -1,50 +1,27 @@ -## Process this file with automake to create Makefile.in +##---------------------------------------------------------------------------- +## $Id$ ## -## $Id$ +## Makefile for the ACE Dump-Restore Name_Server utility +##---------------------------------------------------------------------------- + ## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. +## Process this file with automake to create Makefile.in ## -## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu - -ACE_BUILDDIR = $(top_builddir) - -## Makefile.Netsvcs_Dump_Restore_Lib.am -noinst_LTLIBRARIES = libDump_Restore.la - -libDump_Restore_la_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(ACE_BUILDDIR) \ - -DACE_BUILD_SVC_DLL - -libDump_Restore_la_SOURCES = \ - Dump_Restore.cpp - -libDump_Restore_la_LIBADD = \ - $(top_builddir)/ace/libACE.la -noinst_HEADERS = \ - Dump_Restore.h +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -## Makefile.Netsvcs_Dump_Restore.am -noinst_PROGRAMS = main +noinst_LIBRARIES = \ + libDump_Restore.a -main_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(ACE_BUILDDIR) +libDump_Restore_a_SOURCES = Dump_Restore.cpp Dump_Restore.h -main_SOURCES = \ - main.cpp \ - Dump_Restore.h +noinst_PROGRAMS = \ + main +main_SOURCES = main.cpp main_LDADD = \ - libDump_Restore.la $(top_builddir)/ace/libACE.la + libDump_Restore.a \ + $(top_builddir)/ace/libACE.la -## Clean up template repositories, etc. -clean-local: - -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core - -rm -f gcctemp.c gcctemp so_locations - -rm -rf ptrepository SunWS_cache Templates.DB +## ACE currently doesn't build this so we don't build it with automake either. +EXTRA_DIST = createfile.cpp diff --git a/netsvcs/clients/Naming/Dump_Restore/main.cpp b/netsvcs/clients/Naming/Dump_Restore/main.cpp index 46d298357bc..4d90427edda 100644 --- a/netsvcs/clients/Naming/Dump_Restore/main.cpp +++ b/netsvcs/clients/Naming/Dump_Restore/main.cpp @@ -9,11 +9,11 @@ ACE_RCSID(Dump_Restore, main, "$Id$") int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) +main (int argc, char *argv[]) { ACE_Service_Config daemon (argv[0]); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("entering main\n"))); + ACE_DEBUG ((LM_DEBUG, "entering main\n")); // Get a handler Dump_Restore client_handler (argc, argv); @@ -21,6 +21,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_Reactor::run_event_loop (); /* NOTREACHED */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("leaving main\n"))); + ACE_DEBUG ((LM_DEBUG, "leaving main\n")); return 0; } diff --git a/netsvcs/clients/Naming/Makefile.am b/netsvcs/clients/Naming/Makefile.am index ce115bb2cc7..09924790da5 100644 --- a/netsvcs/clients/Naming/Makefile.am +++ b/netsvcs/clients/Naming/Makefile.am @@ -1,14 +1,19 @@ -## Process this file with automake to create Makefile.in +##--------------------------------------------------------------------------- +## $Id$ ## -## $Id$ +## Makefile for the Name Server test applications ## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. +##--------------------------------------------------------------------------- + ## -## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu +## Process this file with automake to create Makefile.in +## + +## The number in AUTOMAKE_OPTIONS is the minimum required version automake +## needed to process this file. +AUTOMAKE_OPTIONS = 1.4 SUBDIRS = \ - Client \ - Dump_Restore + Client \ + Dump_Restore diff --git a/netsvcs/lib/Client_Logging_Handler.cpp b/netsvcs/lib/Client_Logging_Handler.cpp index ec93d250348..8861c5f7dfc 100644 --- a/netsvcs/lib/Client_Logging_Handler.cpp +++ b/netsvcs/lib/Client_Logging_Handler.cpp @@ -300,12 +300,12 @@ ACE_Client_Logging_Handler::send (ACE_Log_Record &log_record) // since otherwise the values of the <log_record> fields will be in // network byte order. if (orig_ostream) - log_record.print (ACE_TEXT ("<localhost>"), + log_record.print ("<localhost>", ACE_Log_Msg::instance ()->flags (), *orig_ostream); if (this->logging_output_ == ACE_STDERR) - log_record.print (ACE_TEXT ("<localhost>"), + log_record.print ("<localhost>", ACE_Log_Msg::instance ()->flags (), stderr); else @@ -345,13 +345,13 @@ public: protected: // = Dynamic linking hooks. - virtual int init (int argc, ACE_TCHAR *argv[]); + virtual int init (int argc, char *argv[]); // Called when service is linked. virtual int fini (void); // Called when service is unlinked. - virtual int info (ACE_TCHAR **strp, size_t length) const; + virtual int info (char **strp, size_t length) const; // Called to determine info about the service. virtual int make_svc_handler (ACE_Client_Logging_Handler *&sh); @@ -362,10 +362,10 @@ protected: virtual int resume (void); private: - int parse_args (int argc, ACE_TCHAR *argv[]); + int parse_args (int argc, char *argv[]); // Parse svc.conf arguments. - const ACE_TCHAR *server_host_; + const char *server_host_; // Host where the logging server is located. u_short server_port_; @@ -375,7 +375,7 @@ private: ACE_INET_Addr server_addr_; // Address of the logging server. - const ACE_TCHAR *logger_key_; + const char *logger_key_; // Communication endpoint where the client logging daemon will // listen for connections from clients. @@ -411,11 +411,11 @@ ACE_Client_Logging_Acceptor::make_svc_handler (ACE_Client_Logging_Handler *&sh) } int -ACE_Client_Logging_Acceptor::info (ACE_TCHAR **strp, size_t length) const +ACE_Client_Logging_Acceptor::info (char **strp, size_t length) const { - ACE_TCHAR buf[BUFSIZ]; + char buf[BUFSIZ]; - ACE_OS::sprintf (buf, ACE_TEXT ("%d/%s %s"), + ACE_OS::sprintf (buf, "%d/%s %s", this->server_addr_.get_port_number (), "tcp", "# client logging daemon\n"); @@ -435,10 +435,10 @@ ACE_Client_Logging_Acceptor::ACE_Client_Logging_Acceptor (void) } int -ACE_Client_Logging_Acceptor::init (int argc, ACE_TCHAR *argv[]) +ACE_Client_Logging_Acceptor::init (int argc, char *argv[]) { // We'll log *our* error and debug messages to stderr! - ACE_LOG_MSG->open (ACE_TEXT ("Client Logging Service")); + ACE_LOG_MSG->open ("Client Logging Service"); // Use the options hook to parse the command line arguments and set // options. @@ -495,9 +495,9 @@ ACE_Client_Logging_Acceptor::init (int argc, ACE_TCHAR *argv[]) } int -ACE_Client_Logging_Acceptor::parse_args (int argc, ACE_TCHAR *argv[]) +ACE_Client_Logging_Acceptor::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("h:k:p:"), 0); + ACE_Get_Opt get_opt (argc, argv, "h:k:p:", 0); for (int c; (c = get_opt ()) != -1; ) { diff --git a/netsvcs/lib/Log_Message_Receiver.cpp b/netsvcs/lib/Log_Message_Receiver.cpp index b6496232bd3..7c032c453ef 100644 --- a/netsvcs/lib/Log_Message_Receiver.cpp +++ b/netsvcs/lib/Log_Message_Receiver.cpp @@ -10,8 +10,8 @@ ACE_RCSID(lib, Log_Message_Receiver, "$Id$") // Type based log message receiver template<ACE_SYNCH_DECL> void -Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_record (const ACE_TCHAR *hostname, - ACE_Log_Record &record) +Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_record (char const *hostname, + ACE_Log_Record &record) { #if defined (ACE_HAS_THREADS) static ACE_SYNCH_MUTEX_T lock_; @@ -24,7 +24,7 @@ Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_record (const ACE_TCHAR *hostnam } template<ACE_SYNCH_DECL> void -Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_output (const ACE_TCHAR *hostname, +Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_output (char const *hostname, ACE_Log_Record &record, ostream *outputfile) { @@ -106,8 +106,8 @@ Log_Message_Receiver_Impl<ACE_SYNCH_USE>::detach (Log_Message_Receiver_Impl<ACE_ // Type based log message receiver template<ACE_SYNCH_DECL> void -Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_record (const ACE_TCHAR *hostname, - ACE_Log_Record &record) +Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_record (char const *hostname, + ACE_Log_Record &record) { ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX_T, guard, print_lock_)); record.print (hostname, @@ -116,7 +116,7 @@ Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_record (const ACE_TCHAR *hostname, } template<ACE_SYNCH_DECL> void -Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_output (const ACE_TCHAR *hostname, +Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_output (char const *hostname, ACE_Log_Record &record, ostream *outputfile) { @@ -152,15 +152,15 @@ Log_Message_Receiver<ACE_SYNCH_USE>::Log_Message_Receiver // Type based log message receiver template<ACE_SYNCH_DECL> void -Log_Message_Receiver<ACE_SYNCH_USE>::log_record(const ACE_TCHAR *hostname, - ACE_Log_Record &record) +Log_Message_Receiver<ACE_SYNCH_USE>::log_record(char const *hostname, + ACE_Log_Record &record) { ACE_ASSERT (receiver_impl_ != 0); receiver_impl_->log_record (hostname, record); } template<ACE_SYNCH_DECL> void -Log_Message_Receiver<ACE_SYNCH_USE>::log_output(const ACE_TCHAR *hostname, +Log_Message_Receiver<ACE_SYNCH_USE>::log_output(char const *hostname, ACE_Log_Record &record, ostream *outputfile) { diff --git a/netsvcs/lib/Log_Message_Receiver.h b/netsvcs/lib/Log_Message_Receiver.h index 1124b3f4884..d72a07ac809 100644 --- a/netsvcs/lib/Log_Message_Receiver.h +++ b/netsvcs/lib/Log_Message_Receiver.h @@ -38,7 +38,7 @@ // The requiremnts on a log manager receiver, T, are quite simple. // 1: There must exist one "log_record" member function with the following // prototype: -// void log_record(const ACE_TCHAR *hostname, +// void log_record(char const* hostname, // ACE_Log_Record &record); // // 2: There must exist a public destructor. @@ -53,7 +53,7 @@ // receiver. // // Methods: -// void log_record(const ACE_TCHAR* hostname, +// void log_record(char const* hostname, // ACE_Log_Record& record) // Description: // Processes the log record "record" from the host "hostname" @@ -104,12 +104,12 @@ class Static_Log_Message_Receiver // prints the content of log_records on stderr. public: - static void log_record(const ACE_TCHAR *hostname, + static void log_record(const char *hostname, ACE_Log_Record &record); // Prints the log_record to stderr using record.print (hostname, 0, stderr). // Serializes the output by using a ACE_SYNCH_MUTEX. - static void log_output(const ACE_TCHAR *hostname, + static void log_output(const char *hostname, ACE_Log_Record &record, ostream *output); // Prints the log_record to a user specified ostream. @@ -159,10 +159,10 @@ public: Log_Message_Receiver(Log_Message_Receiver<ACE_SYNCH_USE> const &rhs); ~Log_Message_Receiver (void); - void log_record (const ACE_TCHAR *hostname, + void log_record (const char *hostname, ACE_Log_Record &record); - void log_output(const ACE_TCHAR *hostname, + void log_output(const char *hostname, ACE_Log_Record &record, ostream *output); private: @@ -185,10 +185,10 @@ public: static Log_Message_Receiver_Impl *attach (Log_Message_Receiver_Impl<ACE_SYNCH_USE> *body); static void detach (Log_Message_Receiver_Impl<ACE_SYNCH_USE> *body); - void log_record (const ACE_TCHAR *hostname, + void log_record (const char *hostname, ACE_Log_Record &record); - void log_output(const ACE_TCHAR *hostname, + void log_output(const char *hostname, ACE_Log_Record &record, ostream *output); diff --git a/netsvcs/lib/Makefile.am b/netsvcs/lib/Makefile.am index 7fd980d3c3b..a527f3ef54b 100644 --- a/netsvcs/lib/Makefile.am +++ b/netsvcs/lib/Makefile.am @@ -1,51 +1,53 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ +##--------------------------------------------------------------------------- +## $Id$ ## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. +## Makefile for the server-side ACE network services ## -## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu +##--------------------------------------------------------------------------- -ACE_BUILDDIR = $(top_builddir) +## +## Process this file with automake to create Makefile.in +## -## Makefile.netsvcs.am -noinst_LTLIBRARIES = libnetsvcs.la +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -libnetsvcs_la_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(ACE_BUILDDIR) \ - -DACE_NETSVCS_BUILD_DLL +lib_LTLIBRARIES = libnetsvcs.la libnetsvcs_la_SOURCES = \ - Base_Optimizer.cpp \ - Client_Logging_Handler.cpp \ - Log_Message_Receiver.cpp \ - Name_Handler.cpp \ - Server_Logging_Handler.cpp \ - TS_Clerk_Handler.cpp \ - TS_Server_Handler.cpp \ - Token_Handler.cpp - -libnetsvcs_la_LIBADD = \ - $(top_builddir)/ace/libACE.la + Base_Optimizer.cpp \ + Client_Logging_Handler.cpp \ + Log_Message_Receiver.cpp \ + Name_Handler.cpp \ + Server_Logging_Handler.cpp \ + Server_Logging_Handler_T.cpp \ + TS_Clerk_Handler.cpp \ + TS_Server_Handler.cpp \ + Token_Handler.cpp + +libnetsvcs_la_LDFLAGS = \ + -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ noinst_HEADERS = \ - Base_Optimizer.h \ - Client_Logging_Handler.h \ - Log_Message_Receiver.h \ - Name_Handler.h \ - Server_Logging_Handler.h \ - Server_Logging_Handler_T.h \ - TS_Clerk_Handler.h \ - TS_Server_Handler.h \ - Token_Handler.h \ - Server_Logging_Handler_T.cpp + Base_Optimizer.h \ + Client_Logging_Handler.h \ + Log_Message_Receiver.h \ + Name_Handler.h \ + Server_Logging_Handler.h \ + Server_Logging_Handler_T.h \ + TS_Clerk_Handler.h \ + TS_Server_Handler.h \ + Token_Handler.h ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core - -rm -f gcctemp.c gcctemp so_locations - -rm -rf ptrepository SunWS_cache Templates.DB + -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations + + +## What do we about the below? It was in the original libnetsvcs Makefile. +## ifeq ($(SUPPRESS_DASH_G),1) +## #### Build this target without -g on some platforms. +## $(VDIR)Server_Logging_Handler.o $(VSHDIR)Server_Logging_Handler.$(SOEXT): +## $(COMPILE-NO_DASH_G.cc) -o $@ $< +## endif # SUPPRESS_DASH_G + diff --git a/netsvcs/lib/Name_Handler.cpp b/netsvcs/lib/Name_Handler.cpp index a0c20e4c386..63bb145c537 100644 --- a/netsvcs/lib/Name_Handler.cpp +++ b/netsvcs/lib/Name_Handler.cpp @@ -1,5 +1,3 @@ -// $Id$ - #define ACE_BUILD_SVC_DLL #include "ace/Containers.h" @@ -44,15 +42,15 @@ template ACE_Singleton<Naming_Context, ACE_SYNCH_NULL_MUTEX> * #define ACE_LIST_MAP(INDEX, MASK) (((unsigned long) (INDEX & MASK)) >> 3) int -ACE_Name_Acceptor::parse_args (int argc, ACE_TCHAR *argv[]) +ACE_Name_Acceptor::parse_args (int argc, char *argv[]) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Acceptor::parse_args")); + ACE_TRACE ("ACE_Name_Acceptor::parse_args"); int service_port = ACE_DEFAULT_SERVER_PORT; - ACE_LOG_MSG->open (ACE_TEXT ("Name Service")); + ACE_LOG_MSG->open ("Name Service"); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0); + ACE_Get_Opt get_opt (argc, argv, "p:", 0); for (int c; (c = get_opt ()) != -1; ) { @@ -63,7 +61,7 @@ ACE_Name_Acceptor::parse_args (int argc, ACE_TCHAR *argv[]) break; default: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%n:\n[-p server-port]\n")), + "%n:\n[-p server-port]\n%a", 1), -1); } } @@ -73,9 +71,9 @@ ACE_Name_Acceptor::parse_args (int argc, ACE_TCHAR *argv[]) } int -ACE_Name_Acceptor::init (int argc, ACE_TCHAR *argv[]) +ACE_Name_Acceptor::init (int argc, char *argv[]) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Acceptor::init")); + ACE_TRACE ("ACE_Name_Acceptor::init"); // Use the options hook to parse the command line arguments and set // options. @@ -87,11 +85,11 @@ ACE_Name_Acceptor::init (int argc, ACE_TCHAR *argv[]) ACE_Reactor::instance (), 0, 0, 0, &this->scheduling_strategy_, - ACE_TEXT ("Name Server"), - ACE_TEXT ("ACE naming service")) == -1) + "Name Server", + "ACE naming service") == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%n: %p on port %d\n"), - ACE_TEXT ("acceptor::open failed"), + "%n: %p on port %d\n", + "acceptor::open failed", this->service_addr_.get_port_number ()), -1); @@ -105,14 +103,14 @@ ACE_Name_Acceptor::init (int argc, ACE_TCHAR *argv[]) // Figure out what port we're really bound to. if (this->acceptor ().get_local_addr (server_addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("get_local_addr")), + "%p\n", + "get_local_addr"), -1); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("starting up Name Server at port %d on handle %d\n"), - server_addr.get_port_number (), - this->acceptor ().get_handle ())); + "starting up Name Server at port %d on handle %d\n", + server_addr.get_port_number (), + this->acceptor ().get_handle ())); return 0; } @@ -126,7 +124,7 @@ ACE_SVC_FACTORY_DEFINE (ACE_Name_Acceptor) ACE_Name_Handler::ACE_Name_Handler (ACE_Thread_Manager *tm) : ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> (tm) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::ACE_Name_Handler")); + ACE_TRACE ("ACE_Name_Handler::ACE_Name_Handler"); // Set up pointers to member functions for the top-level dispatching // of client requests. @@ -167,13 +165,13 @@ ACE_Name_Handler::ACE_Name_Handler (ACE_Thread_Manager *tm) /* VIRTUAL */ int ACE_Name_Handler::open (void *) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::open")); + ACE_TRACE ("ACE_Name_Handler::open"); // Call down to our parent to register ourselves with the Reactor. if (ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>::open (0) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("open")), + "%p\n", + "open"), -1); return 0; } @@ -184,7 +182,7 @@ ACE_Name_Handler::open (void *) ACE_Name_Handler::send_reply (ACE_INT32 status, ACE_UINT32 err) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::send_reply")); + ACE_TRACE ("ACE_Name_Handler::send_reply"); void *buf; this->name_reply_.msg_type (status); this->name_reply_.errnum (err); @@ -199,8 +197,8 @@ ACE_Name_Handler::send_reply (ACE_INT32 status, if (n != len) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n, expected len = %d, actual len = %d"), - ACE_TEXT ("send failed"), + "%p\n, expected len = %d, actual len = %d", + "send failed", len, n), -1); @@ -211,21 +209,21 @@ ACE_Name_Handler::send_reply (ACE_INT32 status, /* VIRTUAL */ int ACE_Name_Handler::send_request (ACE_Name_Request &request) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::send_request")); + ACE_TRACE ("ACE_Name_Handler::send_request"); void *buffer; ssize_t length = request.encode (buffer); if (length == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("encode failed")), + "%p\n", + "encode failed"), -1); // Transmit request via a blocking send. if (this->peer ().send_n (buffer, length) != length) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("send_n failed")), + "%p\n", + "send_n failed"), -1); return 0; } @@ -236,7 +234,7 @@ ACE_Name_Handler::send_request (ACE_Name_Request &request) /* VIRTUAL */ int ACE_Name_Handler::abandon (void) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::abandon")); + ACE_TRACE ("ACE_Name_Handler::abandon"); return this->send_reply (-1, errno); } @@ -245,7 +243,7 @@ ACE_Name_Handler::abandon (void) /* VIRTUAL */ int ACE_Name_Handler::handle_timeout (const ACE_Time_Value &, const void *) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::handle_timeout")); + ACE_TRACE ("ACE_Name_Handler::handle_timeout"); return this->abandon (); } @@ -254,7 +252,7 @@ ACE_Name_Handler::handle_timeout (const ACE_Time_Value &, const void *) /* VIRTUAL */ ACE_HANDLE ACE_Name_Handler::get_handle (void) const { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::get_handle")); + ACE_TRACE ("ACE_Name_Handler::get_handle"); return this->peer ().get_handle (); } @@ -263,7 +261,7 @@ ACE_Name_Handler::get_handle (void) const /* VIRTUAL */ int ACE_Name_Handler::dispatch (void) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::dispatch")); + ACE_TRACE ("ACE_Name_Handler::dispatch"); // Dispatch the appropriate request. int index = this->name_request_.msg_type (); @@ -283,7 +281,7 @@ ACE_Name_Handler::dispatch (void) /* VIRTUAL */ int ACE_Name_Handler::recv_request (void) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::recv_request")); + ACE_TRACE ("ACE_Name_Handler::recv_request"); // Read the first 4 bytes to get the length of the message This // implementation assumes that the first 4 bytes are the length of // the message. @@ -294,11 +292,11 @@ ACE_Name_Handler::recv_request (void) case -1: /* FALLTHROUGH */ ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("****************** recv_request returned -1\n"))); + "****************** recv_request returned -1\n")); default: ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p got %d bytes, expected %d bytes\n"), - ACE_TEXT ("recv failed"), + "%p got %d bytes, expected %d bytes\n", + "recv failed", n, sizeof (ACE_UINT32))); /* FALLTHROUGH */ @@ -316,7 +314,7 @@ ACE_Name_Handler::recv_request (void) if (length > (ssize_t) sizeof this->name_request_) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("length %d too long\n"), + "length %d too long\n", length)); return this->abandon (); } @@ -330,8 +328,8 @@ ACE_Name_Handler::recv_request (void) // Subtract off the size of the part we skipped over... if (n != (length - (ssize_t) sizeof (ACE_UINT32))) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p expected %d, got %d\n"), - ACE_TEXT ("invalid length"), length, n)); + ACE_ERROR ((LM_ERROR, "%p expected %d, got %d\n", + "invalid length", length, n)); return this->abandon (); } @@ -339,8 +337,8 @@ ACE_Name_Handler::recv_request (void) if (this->name_request_.decode () == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("decode failed"))); + "%p\n", + "decode failed")); return this->abandon (); } } @@ -354,7 +352,7 @@ ACE_Name_Handler::recv_request (void) /* VIRTUAL */ int ACE_Name_Handler::handle_input (ACE_HANDLE) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::handle_input")); + ACE_TRACE ("ACE_Name_Handler::handle_input"); if (this->recv_request () == -1) return -1; @@ -365,14 +363,14 @@ ACE_Name_Handler::handle_input (ACE_HANDLE) int ACE_Name_Handler::bind (void) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::bind")); + ACE_TRACE ("ACE_Name_Handler::bind"); return this->shared_bind (0); } int ACE_Name_Handler::rebind (void) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::rebind")); + ACE_TRACE ("ACE_Name_Handler::rebind"); int result = this->shared_bind (1); return result == 1 ? 0 : result; } @@ -380,7 +378,7 @@ ACE_Name_Handler::rebind (void) int ACE_Name_Handler::shared_bind (int rebind) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::shared_bind")); + ACE_TRACE ("ACE_Name_Handler::shared_bind"); ACE_NS_WString a_name (this->name_request_.name (), this->name_request_.name_len () / sizeof (ACE_WCHAR_T)); ACE_NS_WString a_value (this->name_request_.value (), @@ -390,7 +388,7 @@ ACE_Name_Handler::shared_bind (int rebind) { #if 0 ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("request for BIND \n"))); + "request for BIND \n")); #endif /* 0 */ result = NAMING_CONTEXT::instance ()->bind (a_name, a_value, @@ -400,7 +398,7 @@ ACE_Name_Handler::shared_bind (int rebind) { #if 0 ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("request for REBIND \n"))); + "request for REBIND \n")); #endif /* 0 */ result = NAMING_CONTEXT::instance ()->rebind (a_name, a_value, @@ -417,9 +415,9 @@ ACE_Name_Handler::shared_bind (int rebind) int ACE_Name_Handler::resolve (void) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::resolve")); + ACE_TRACE ("ACE_Name_Handler::resolve"); #if 0 - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("request for RESOLVE \n"))); + ACE_DEBUG ((LM_DEBUG, "request for RESOLVE \n")); #endif /* 0 */ ACE_NS_WString a_name (this->name_request_.name (), this->name_request_.name_len () / sizeof (ACE_WCHAR_T)); @@ -450,9 +448,9 @@ ACE_Name_Handler::resolve (void) int ACE_Name_Handler::unbind (void) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::unbind")); + ACE_TRACE ("ACE_Name_Handler::unbind"); #if 0 - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("request for UNBIND \n"))); + ACE_DEBUG ((LM_DEBUG, "request for UNBIND \n")); #endif /* 0 */ ACE_NS_WString a_name (this->name_request_.name (), this->name_request_.name_len () / sizeof (ACE_WCHAR_T)); @@ -466,7 +464,7 @@ ACE_Name_Handler::unbind (void) ACE_Name_Request ACE_Name_Handler::name_request (ACE_NS_WString *one_name) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::name_request")); + ACE_TRACE ("ACE_Name_Handler::name_request"); ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> one_name_urep (one_name->rep ()); return ACE_Name_Request (ACE_Name_Request::LIST_NAMES, one_name_urep.get (), @@ -478,7 +476,7 @@ ACE_Name_Handler::name_request (ACE_NS_WString *one_name) ACE_Name_Request ACE_Name_Handler::value_request (ACE_NS_WString *one_value) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::value_request")); + ACE_TRACE ("ACE_Name_Handler::value_request"); ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> one_value_urep (one_value->rep ()); return ACE_Name_Request (ACE_Name_Request::LIST_VALUES, 0, 0, @@ -490,7 +488,7 @@ ACE_Name_Handler::value_request (ACE_NS_WString *one_value) ACE_Name_Request ACE_Name_Handler::type_request (ACE_NS_WString *one_type) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::type_request")); + ACE_TRACE ("ACE_Name_Handler::type_request"); return ACE_Name_Request (ACE_Name_Request::LIST_TYPES, 0, 0, 0, 0, @@ -501,7 +499,7 @@ ACE_Name_Handler::type_request (ACE_NS_WString *one_type) int ACE_Name_Handler::lists (void) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::lists")); + ACE_TRACE ("ACE_Name_Handler::lists"); ACE_PWSTRING_SET set; ACE_NS_WString pattern (this->name_request_.name (), @@ -552,7 +550,7 @@ ACE_Name_Handler::lists (void) int ACE_Name_Handler::lists_entries (void) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::lists_entries")); + ACE_TRACE ("ACE_Name_Handler::lists_entries"); ACE_BINDING_SET set; ACE_NS_WString pattern (this->name_request_.name (), this->name_request_.name_len () / sizeof (ACE_WCHAR_T)); @@ -571,7 +569,7 @@ ACE_Name_Handler::lists_entries (void) { #if 0 ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("request for LIST_NAME_ENTRIES \n"))); + "request for LIST_NAME_ENTRIES \n")); #endif /* 0 */ result = NAMING_CONTEXT::instance ()-> ACE_Naming_Context::list_name_entries (set, pattern); @@ -580,7 +578,7 @@ ACE_Name_Handler::lists_entries (void) { #if 0 ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("request for LIST_VALUE_ENTRIES \n"))); + "request for LIST_VALUE_ENTRIES \n")); #endif /* 0 */ result = NAMING_CONTEXT::instance ()-> ACE_Naming_Context::list_value_entries (set, pattern); @@ -589,7 +587,7 @@ ACE_Name_Handler::lists_entries (void) { #if 0 ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("request for LIST_TYPE_ENTRIES \n"))); + "request for LIST_TYPE_ENTRIES \n")); #endif /* 0 */ result = NAMING_CONTEXT::instance ()-> ACE_Naming_Context::list_type_entries (set, pattern); @@ -641,9 +639,9 @@ ACE_Name_Handler::lists_entries (void) ACE_Name_Handler::~ACE_Name_Handler (void) { - ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::~ACE_Name_Handler")); + ACE_TRACE ("ACE_Name_Handler::~ACE_Name_Handler"); #if 0 - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("closing down Handle %d\n"), + ACE_DEBUG ((LM_DEBUG, "closing down Handle %d\n", this->get_handle ())); #endif /* 0 */ } diff --git a/netsvcs/lib/Name_Handler.h b/netsvcs/lib/Name_Handler.h index 300da03bfdc..02e0146d13d 100644 --- a/netsvcs/lib/Name_Handler.h +++ b/netsvcs/lib/Name_Handler.h @@ -197,10 +197,10 @@ class ACE_Name_Acceptor : public ACE_Strategy_Acceptor<ACE_Name_Handler, ACE_SOC // This class contains the service-specific methods that can't // easily be factored into the <ACE_Strategy_Acceptor>. public: - virtual int init (int argc, ACE_TCHAR *argv[]); + virtual int init (int argc, char *argv[]); // Dynamic linking hook. - int parse_args (int argc, ACE_TCHAR *argv[]); + int parse_args (int argc, char *argv[]); // Parse svc.conf arguments. private: diff --git a/netsvcs/lib/Server_Logging_Handler_T.cpp b/netsvcs/lib/Server_Logging_Handler_T.cpp index abb2d82affb..e3d16f378da 100644 --- a/netsvcs/lib/Server_Logging_Handler_T.cpp +++ b/netsvcs/lib/Server_Logging_Handler_T.cpp @@ -34,7 +34,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::AC : receiver_ (receiver, ACE_CString (" ", 1)) #else : receiver_ (receiver), - host_name_ (ACE_TString (ACE_TEXT (" "), 1)) + host_name_ (ACE_CString (" ", 1)) #endif /* ! ACE_HAS_BROKEN_HPUX_TEMPLATES && ! __GNUG__ */ { } @@ -49,7 +49,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha return result > 0 ? 0 : -1; } -template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_DECL, class LMR> const ACE_TCHAR * +template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_DECL, class LMR> const char * ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::host_name (void) { #if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) && !defined (__GNUG__) @@ -77,14 +77,14 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha default: case -1: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p at host %s\n"), - ACE_TEXT ("server logger"), + "%p at host %s\n", + "server logger", this->host_name ()), -1); /* NOTREACHED */ case 0: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("closing log daemon at host %C\n"), + "closing log daemon at host %s\n", this->host_name ()), -1); /* NOTREACHED */ @@ -100,7 +100,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha # if 0 u_long count = this->request_count_; ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("request count = %d, length = %d\n"), + "request count = %d, length = %d\n", count, length)); # endif /* 0 */ @@ -111,10 +111,10 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha length); if (n != length) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%d != %d, %p at host %C\n"), + "%d != %d, %p at host %s\n", n, length, - ACE_TEXT ("server logger"), + "server logger", this->host_name ()), -1); @@ -135,7 +135,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha } else ACE_ERROR ((LM_ERROR, - ACE_TEXT ("error, lp.length = %d, n = %d\n"), + "error, lp.length = %d, n = %d\n", lp.length (), n)); return n; @@ -154,28 +154,26 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::op // Shut off non-blocking IO if it was enabled... if (this->peer ().disable (ACE_NONBLOCK) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("disable")), + "%p\n", + "disable"), -1); ACE_PEER_STREAM_ADDR client_addr; // Determine the address of the client and display it. if (this->peer ().get_remote_addr (client_addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("get_remote_addr")), + "%p\n", + "get_remote_addr"), -1); #if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) && !defined (__GNUG__) - this->receiver_.m_ = - ACE_TString (ACE_TEXT_CHAR_TO_TCHAR (client_addr.get_host_name ())); + this->receiver_.m_ = ACE_CString (client_addr.get_host_name ()); #else - this->host_name_ = - ACE_TString (ACE_TEXT_CHAR_TO_TCHAR (client_addr.get_host_name ())); + this->host_name_ = ACE_CString (client_addr.get_host_name ()); #endif /* ! ACE_HAS_BROKEN_HPUX_TEMPLATES && ! __GNUG__ */ ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) accepted connection from host %C on fd %d\n"), + "(%t) accepted connection from host %s on fd %d\n", client_addr.get_host_name (), this->peer ().get_handle ())); @@ -204,9 +202,9 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::scheduling_strategy (void) } template<class SLH, class LMR, class SST> int -ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init (int argc, ACE_TCHAR *argv[]) +ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init (int argc, char *argv[]) { - ACE_TRACE (ACE_TEXT ("ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init")); + ACE_TRACE ("ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init"); // Use the options hook to parse the command line arguments and set // options. @@ -218,11 +216,11 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init (int argc, ACE_TCHAR *argv[]) ACE_Reactor::instance (), 0, 0, 0, &this->scheduling_strategy(), - ACE_TEXT ("Logging Server"), - ACE_TEXT ("ACE logging service")) == -1) + "Logging Server", + "ACE logging service") == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%n: %p on port %d\n"), - ACE_TEXT ("acceptor::open failed"), + "%n: %p on port %d\n", + "acceptor::open failed", this->service_addr_.get_port_number ()), -1); // Ignore SIGPIPE so that each <SVC_HANDLER> can handle this on its @@ -235,26 +233,26 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init (int argc, ACE_TCHAR *argv[]) // Figure out what port we're really bound to. if (this->acceptor ().get_local_addr (server_addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("get_local_addr")), + "%p\n", + "get_local_addr"), -1); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("starting up Logging Server at port %d on handle %d\n"), - server_addr.get_port_number (), - this->acceptor ().get_handle ())); + "starting up Logging Server at port %d on handle %d\n", + server_addr.get_port_number (), + this->acceptor ().get_handle ())); return 0; } template<class SLH, class LMR, class SST> int -ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args (int argc, ACE_TCHAR *argv[]) +ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args (int argc, char *argv[]) { - ACE_TRACE (ACE_TEXT ("ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args")); + ACE_TRACE ("ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args"); int service_port = ACE_DEFAULT_SERVER_PORT; - ACE_LOG_MSG->open (ACE_TEXT ("Logging Service")); + ACE_LOG_MSG->open ("Logging Service"); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0); + ACE_Get_Opt get_opt (argc, argv, "p:", 0); for (int c; (c = get_opt ()) != -1; ) { @@ -265,8 +263,8 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args (int argc, ACE_TCHAR *a break; default: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%n:\n[-p server-port]\n")), - -1); + "%n:\n[-p server-port]\n%a", 1), + -1); } } @@ -341,8 +339,8 @@ ACE_Thr_Server_Logging_Handler<LOG_MESSAGE_RECEIVER>::open (void *) // control all the threads. if (this->activate (THR_BOUND | THR_DETACHED) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("spawn")), + "%p\n", + "spawn"), -1); return 0; } diff --git a/netsvcs/lib/Server_Logging_Handler_T.h b/netsvcs/lib/Server_Logging_Handler_T.h index 4cf1a5d3fbc..229e4aeb339 100644 --- a/netsvcs/lib/Server_Logging_Handler_T.h +++ b/netsvcs/lib/Server_Logging_Handler_T.h @@ -76,9 +76,9 @@ protected: // a class with no instance data. #else LOG_MESSAGE_RECEIVER receiver_; - ACE_TString host_name_; + ACE_CString host_name_; #endif /* ! ACE_HAS_BROKEN_HPUX_TEMPLATES && ! __GNUG__ */ - const ACE_TCHAR *host_name (void); + const char *host_name (void); // Name of the host we are connected to. LOG_MESSAGE_RECEIVER &receiver (void){ return receiver_; } @@ -106,11 +106,11 @@ class ACE_Server_Logging_Acceptor_T : public ACE_Strategy_Acceptor<SERVER_LOGGIN // easily be factored into the <ACE_Strategy_Acceptor>. public: ACE_Server_Logging_Acceptor_T (void); - virtual int init (int argc, ACE_TCHAR *argv[]); + virtual int init (int argc, char *argv[]); // Dynamic linking hook. protected: - int parse_args (int argc, ACE_TCHAR *argv[]); + int parse_args (int argc, char *argv[]); // Parse svc.conf arguments. virtual int make_svc_handler (SERVER_LOGGING_HANDLER *&); diff --git a/netsvcs/lib/TS_Clerk_Handler.cpp b/netsvcs/lib/TS_Clerk_Handler.cpp index 8346156fa47..d8e6a3d7612 100644 --- a/netsvcs/lib/TS_Clerk_Handler.cpp +++ b/netsvcs/lib/TS_Clerk_Handler.cpp @@ -28,7 +28,7 @@ ACE_TS_Clerk_Handler::ACE_TS_Clerk_Handler (ACE_TS_Clerk_Processor *processor, void ACE_TS_Clerk_Handler::state (ACE_TS_Clerk_Handler::State state) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::state")); + ACE_TRACE ("ACE_TS_Clerk_Handler::state"); this->state_ = state; } @@ -36,7 +36,7 @@ ACE_TS_Clerk_Handler::state (ACE_TS_Clerk_Handler::State state) ACE_TS_Clerk_Handler::State ACE_TS_Clerk_Handler::state (void) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::state")); + ACE_TRACE ("ACE_TS_Clerk_Handler::state"); return this->state_; } @@ -44,7 +44,7 @@ ACE_TS_Clerk_Handler::state (void) void ACE_TS_Clerk_Handler::timeout (int to) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::timeout")); + ACE_TRACE ("ACE_TS_Clerk_Handler::timeout"); if (to > this->max_timeout_) to = this->max_timeout_; @@ -57,7 +57,7 @@ ACE_TS_Clerk_Handler::timeout (int to) int ACE_TS_Clerk_Handler::timeout (void) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::timeout")); + ACE_TRACE ("ACE_TS_Clerk_Handler::timeout"); int old_timeout = this->timeout_; this->timeout_ *= 2; @@ -79,7 +79,7 @@ ACE_TS_Clerk_Handler::handle_signal (int, siginfo_t *, ucontext_t *) void ACE_TS_Clerk_Handler::max_timeout (int mto) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::max_timeout")); + ACE_TRACE ("ACE_TS_Clerk_Handler::max_timeout"); this->max_timeout_ = mto; } @@ -87,14 +87,14 @@ ACE_TS_Clerk_Handler::max_timeout (int mto) int ACE_TS_Clerk_Handler::max_timeout (void) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::max_timeout")); + ACE_TRACE ("ACE_TS_Clerk_Handler::max_timeout"); return this->max_timeout_; } int ACE_TS_Clerk_Handler::open (void *) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::open")); + ACE_TRACE ("ACE_TS_Clerk_Handler::open"); ACE_INET_Addr server_addr; // Set connection state as established @@ -104,26 +104,23 @@ ACE_TS_Clerk_Handler::open (void *) // reconnections. #if !defined (ACE_WIN32) if (ACE_Reactor::instance ()->register_handler (SIGPIPE, this) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%n: %p\n"), - ACE_TEXT ("register_handler (SIGPIPE)")), -1); + ACE_ERROR_RETURN ((LM_ERROR, "%n: %p\n", + "register_handler (SIGPIPE)"), -1); #endif /* ACE_WIN32 */ // Register ourselves with the reactor to receive input if (ACE_Reactor::instance ()->register_handler (this->get_handle (), - this, + this, ACE_Event_Handler::READ_MASK | ACE_Event_Handler::EXCEPT_MASK) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%n: %p\n"), - ACE_TEXT ("register_handler (this)"))); + ACE_ERROR ((LM_ERROR, "%n: %p\n", "register_handler (this)")); // Figure out what remote port we're really bound to. else if (this->peer ().get_remote_addr (server_addr) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), - ACE_TEXT ("get_remote_addr")), - -1); + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "get_remote_addr"), -1); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TS Clerk Daemon connected to port %d on handle %d\n"), + "TS Clerk Daemon connected to port %d on handle %d\n", server_addr.get_port_number (), this->peer ().get_handle ())); @@ -133,7 +130,7 @@ ACE_TS_Clerk_Handler::open (void *) ACE_HANDLE ACE_TS_Clerk_Handler::get_handle (void) const { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::get_handle")); + ACE_TRACE ("ACE_TS_Clerk_Handler::get_handle"); return this->peer().get_handle (); } @@ -141,11 +138,10 @@ int ACE_TS_Clerk_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask mask) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::handle_close")); + ACE_TRACE ("ACE_TS_Clerk_Handler::handle_close"); ACE_UNUSED_ARG (mask); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) shutting down on handle %d\n"), - this->get_handle ())); + ACE_DEBUG ((LM_DEBUG, "(%t) shutting down on handle %d\n", this->get_handle ())); return this->reinitiate_connection (); } @@ -153,7 +149,7 @@ ACE_TS_Clerk_Handler::handle_close (ACE_HANDLE, int ACE_TS_Clerk_Handler::reinitiate_connection (void) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::reinitiate_connection")); + ACE_TRACE ("ACE_TS_Clerk_Handler::reinitiate_connection"); // Skip over deactivated descriptors. // Set state to connecting so that we don't try to send anything @@ -161,14 +157,12 @@ ACE_TS_Clerk_Handler::reinitiate_connection (void) this->state (ACE_TS_Clerk_Handler::CONNECTING); if (this->get_handle () != ACE_INVALID_HANDLE) { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Scheduling reinitiation of connection\n"))); + ACE_DEBUG ((LM_DEBUG, "(%t) Scheduling reinitiation of connection\n")); // Reschedule ourselves to try and connect again. if (ACE_Reactor::instance ()->schedule_timer (this, 0, - this->timeout ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("schedule_timer")), -1); + this->timeout ()) == -1) + ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "schedule_timer"), -1); } return 0; } @@ -177,7 +171,7 @@ ACE_TS_Clerk_Handler::reinitiate_connection (void) int ACE_TS_Clerk_Handler::handle_input (ACE_HANDLE) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::handle_input")); + ACE_TRACE ("ACE_TS_Clerk_Handler::handle_input"); // We're getting a time update message from a server ACE_Time_Request reply; if (this->recv_reply (reply) != 0) @@ -207,9 +201,9 @@ int ACE_TS_Clerk_Handler::handle_timeout (const ACE_Time_Value &, const void *) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::handle_timeout")); + ACE_TRACE ("ACE_TS_Clerk_Handler::handle_timeout"); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) attempting to reconnect to server with timeout = %d\n"), + "(%t) attempting to reconnect to server with timeout = %d\n", this->timeout_)); // Close down peer to reclaim descriptor if need be. Note this is @@ -222,21 +216,21 @@ ACE_TS_Clerk_Handler::handle_timeout (const ACE_Time_Value &, void ACE_TS_Clerk_Handler::remote_addr (ACE_INET_Addr &addr) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::remote_addr")); + ACE_TRACE ("ACE_TS_Clerk_Handler::remote_addr"); this->remote_addr_ = addr; } ACE_INET_Addr & ACE_TS_Clerk_Handler::remote_addr (void) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::remote_addr")); + ACE_TRACE ("ACE_TS_Clerk_Handler::remote_addr"); return this->remote_addr_; } int ACE_TS_Clerk_Handler::recv_reply (ACE_Time_Request &reply) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::recv_reply")); + ACE_TRACE ("ACE_TS_Clerk_Handler::recv_reply"); const int bytes_expected = reply.size (); // Since Time_Request messages are fixed size, read the entire @@ -249,10 +243,10 @@ ACE_TS_Clerk_Handler::recv_reply (ACE_Time_Request &reply) { case -1: // FALLTHROUGH - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("****************** recv_reply returned -1\n"))); + ACE_DEBUG ((LM_DEBUG, "****************** recv_reply returned -1\n")); default: - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p got %d bytes, expected %d bytes\n"), - ACE_TEXT ("recv failed"), n, bytes_expected)); + ACE_ERROR ((LM_ERROR, "%p got %d bytes, expected %d bytes\n", + "recv failed", n, bytes_expected)); // FALLTHROUGH case 0: // We've shutdown unexpectedly @@ -261,8 +255,7 @@ ACE_TS_Clerk_Handler::recv_reply (ACE_Time_Request &reply) } } else if (reply.decode () == -1) // Decode the request into host byte order. - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), - ACE_TEXT ("decode failed")), -1); + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "decode failed"), -1); return 0; } @@ -270,7 +263,7 @@ ACE_TS_Clerk_Handler::recv_reply (ACE_Time_Request &reply) int ACE_TS_Clerk_Handler::send_request (ACE_UINT32 sequence_num, ACE_Time_Info &time_info) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::send_request")); + ACE_TRACE ("ACE_TS_Clerk_Handler::send_request"); void *buffer; ssize_t length; @@ -285,8 +278,7 @@ ACE_TS_Clerk_Handler::send_request (ACE_UINT32 sequence_num, ACE_Time_Info &time ACE_Time_Request request (ACE_Time_Request::TIME_UPDATE, 0, 0); if ((length = request.encode (buffer)) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), - ACE_TEXT ("encode failed")), -1); + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "encode failed"), -1); // Compute start time of sending request (needed to compute // roundtrip delay) @@ -294,9 +286,7 @@ ACE_TS_Clerk_Handler::send_request (ACE_UINT32 sequence_num, ACE_Time_Info &time // Send the request if (this->peer ().send_n (buffer, length) != length) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), - ACE_TEXT ("send_n failed")), - -1); + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "send_n failed"), -1); return 0; } @@ -315,13 +305,13 @@ ACE_TS_Clerk_Processor::ACE_TS_Clerk_Processor () MAXPATHLEN - 17) == -1) // -17 for ace-malloc-XXXXXX { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Temporary path too long, ") - ACE_TEXT ("defaulting to current directory\n"))); + "Temporary path too long, " + "defaulting to current directory\n")); this->poolname_[0] = 0; } // Add the filename to the end - ACE_OS::strcat (this->poolname_, ACE_TEXT ("ace-malloc-XXXXXX")); + ACE_OS::strcat (this->poolname_, "ace-malloc-XXXXXX"); #endif /* ACE_DEFAULT_BACKING_STORE */ } @@ -329,7 +319,7 @@ ACE_TS_Clerk_Processor::ACE_TS_Clerk_Processor () void ACE_TS_Clerk_Processor::alloc (void) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::alloc")); + ACE_TRACE ("ACE_TS_Clerk_Processor::alloc"); ACE_NEW (this->shmem_, ALLOCATOR (this->poolname_)); // Only create the state if it doesn't already exist. @@ -357,14 +347,14 @@ int ACE_TS_Clerk_Processor::handle_timeout (const ACE_Time_Value &, const void *) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::handle_timeout")); + ACE_TRACE ("ACE_TS_Clerk_Processor::handle_timeout"); return this->update_time (); } int ACE_TS_Clerk_Processor::update_time () { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::update_time")); + ACE_TRACE ("ACE_TS_Clerk_Processor::update_time"); ACE_UINT32 expected_sequence_num = this->cur_sequence_num_; // Increment sequence number @@ -390,9 +380,7 @@ ACE_TS_Clerk_Processor::update_time () time_info.sequence_num_ == expected_sequence_num) { count++; - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("[%d] Delta time: %d\n"), - count, time_info.delta_time_)); + ACE_DEBUG ((LM_DEBUG, "[%d] Delta time: %d\n", count, time_info.delta_time_)); // #### Can check here if delta value falls within a threshold #### total_delta += time_info.delta_time_; @@ -418,8 +406,7 @@ ACE_TS_Clerk_Processor::update_time () // Update the last local time *(this->system_time_.last_local_time_) = ACE_OS::time (0); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Average delta time: %d\n"), - *(this->system_time_.delta_time_))); + ACE_DEBUG ((LM_DEBUG, "Average delta time: %d\n", *(this->system_time_.delta_time_))); return 0; } @@ -427,7 +414,7 @@ ACE_TS_Clerk_Processor::update_time () int ACE_TS_Clerk_Processor::fini (void) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::fini")); + ACE_TRACE ("ACE_TS_Clerk_Processor::fini"); // Cancel the timer if (this->timer_id_ != -1) @@ -457,16 +444,16 @@ ACE_TS_Clerk_Processor::fini (void) } int -ACE_TS_Clerk_Processor::info (ACE_TCHAR **, size_t) const +ACE_TS_Clerk_Processor::info (char **, size_t) const { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::info")); + ACE_TRACE ("ACE_TS_Clerk_Processor::info"); return 0; } int -ACE_TS_Clerk_Processor::init (int argc, ACE_TCHAR *argv[]) +ACE_TS_Clerk_Processor::init (int argc, char *argv[]) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::init")); + ACE_TRACE ("ACE_TS_Clerk_Processor::init"); // Use the options hook to parse the command line arguments and set // options. this->parse_args (argc, argv); @@ -494,9 +481,9 @@ ACE_TS_Clerk_Processor::init (int argc, ACE_TCHAR *argv[]) // Now set up timer to receive updates from server // set the timer to go off after timeout value this->timer_id_ = ACE_Reactor::instance ()->schedule_timer (this, - NULL, - ACE_Time_Value (this->timeout_), - ACE_Time_Value (this->timeout_)); + NULL, + ACE_Time_Value (this->timeout_), + ACE_Time_Value (this->timeout_)); return 0; } @@ -504,16 +491,16 @@ int ACE_TS_Clerk_Processor::initiate_connection (ACE_TS_Clerk_Handler *handler, ACE_Synch_Options &synch_options) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::initiate_connection")); - ACE_TCHAR buf[MAXHOSTNAMELEN + 1]; + ACE_TRACE ("ACE_TS_Clerk_Processor::initiate_connection"); + char buf[MAXHOSTNAMELEN + 1]; // Mark ourselves as idle so that the various iterators will ignore // us until we are connected/reconnected. handler->state (ACE_TS_Clerk_Handler::IDLE); - if (handler->remote_addr ().addr_to_string (buf, MAXHOSTNAMELEN) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("can't obtain peer's address")), -1); + if (handler->remote_addr ().addr_to_string (buf, sizeof buf) == -1) + ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", + "can't obtain peer's address"), -1); // Establish connection with the server. if (this->connect (handler, @@ -523,17 +510,15 @@ ACE_TS_Clerk_Processor::initiate_connection (ACE_TS_Clerk_Handler *handler, if (errno != EWOULDBLOCK) { handler->state (ACE_TS_Clerk_Handler::FAILED); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %p on address %s\n"), - ACE_TEXT ("connect"), buf)); + ACE_DEBUG ((LM_DEBUG, "(%t) %p on address %s\n", "connect", buf)); // Reschedule ourselves to try and connect again. if (synch_options[ACE_Synch_Options::USE_REACTOR]) { if (ACE_Reactor::instance ()->schedule_timer (handler, - 0, - handler->timeout ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("schedule_timer")), -1); + 0, + handler->timeout ()) == -1) + ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "schedule_timer"), -1); } else // Failures on synchronous connects are reported as errors @@ -544,29 +529,34 @@ ACE_TS_Clerk_Processor::initiate_connection (ACE_TS_Clerk_Handler *handler, { handler->state (ACE_TS_Clerk_Handler::CONNECTING); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) in the process of connecting %s to %s\n"), - synch_options[ACE_Synch_Options::USE_REACTOR] ? - ACE_TEXT ("asynchronously") : ACE_TEXT ("synchronously"), - buf)); + "(%t) in the process of connecting %s to %s\n", + synch_options[ACE_Synch_Options::USE_REACTOR] + ? "asynchronously" : "synchronously", buf)); } } else { handler->state (ACE_TS_Clerk_Handler::ESTABLISHED); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) connected to %s on %d\n"), - buf, handler->get_handle ())); + ACE_DEBUG ((LM_DEBUG, "(%t) connected to %s on %d\n", + buf, handler->get_handle ())); } return 0; } int -ACE_TS_Clerk_Processor::parse_args (int argc, ACE_TCHAR *argv[]) +ACE_TS_Clerk_Processor::parse_args (int argc, char *argv[]) { - ACE_TRACE (ACE_TESXT ("ACE_TS_Clerk_Processor::parse_args")); + ACE_TRACE ("ACE_TS_Clerk_Processor::parse_args"); ACE_INET_Addr server_addr; ACE_TS_Clerk_Handler *handler; + char server_host[BUFSIZ]; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("h:t:p:b"), 0); + // Create a default entry + ACE_OS::sprintf (server_host, "%s:%d", + ACE_DEFAULT_SERVER_HOST, + ACE_DEFAULT_LOGGING_SERVER_PORT); + + ACE_Get_Opt get_opt (argc, argv, "h:t:p:b", 0); for (int c; (c = get_opt ()) != -1; ) { @@ -591,7 +581,7 @@ ACE_TS_Clerk_Processor::parse_args (int argc, ACE_TCHAR *argv[]) case 'p': // Get the poolname ACE_OS::strncpy (this->poolname_, - get_opt.opt_arg (), + ACE_TEXT_CHAR_TO_TCHAR (get_opt.opt_arg ()), sizeof this->poolname_ / sizeof (ACE_TCHAR)); break; case 'b': @@ -600,7 +590,7 @@ ACE_TS_Clerk_Processor::parse_args (int argc, ACE_TCHAR *argv[]) break; default: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%n:\n[-h hostname:port] [-t timeout] [-p poolname]\n")), + "%n:\n[-h hostname:port] [-t timeout] [-p poolname]\n%a", 1), -1); } } @@ -610,14 +600,14 @@ ACE_TS_Clerk_Processor::parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TS_Clerk_Processor::suspend (void) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::suspend")); + ACE_TRACE ("ACE_TS_Clerk_Processor::suspend"); return 0; } int ACE_TS_Clerk_Processor::resume (void) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::resume")); + ACE_TRACE ("ACE_TS_Clerk_Processor::resume"); return 0; } diff --git a/netsvcs/lib/TS_Clerk_Handler.h b/netsvcs/lib/TS_Clerk_Handler.h index efad8fac6e1..8e44d8cb2e3 100644 --- a/netsvcs/lib/TS_Clerk_Handler.h +++ b/netsvcs/lib/TS_Clerk_Handler.h @@ -190,13 +190,13 @@ public: protected: // = Dynamic linking hooks. - virtual int init (int argc, ACE_TCHAR *argv[]); + virtual int init (int argc, char *argv[]); // Called when service is linked. virtual int fini (void); // Called when service is unlinked. - virtual int info (ACE_TCHAR **strp, size_t length) const; + virtual int info (char **strp, size_t length) const; // Called to determine info about the service. // = Scheduling hooks. @@ -204,7 +204,7 @@ protected: virtual int resume (void); private: - int parse_args (int argc, ACE_TCHAR *argv[]); + int parse_args (int argc, char *argv[]); // Parse svc.conf arguments. void alloc (void); diff --git a/netsvcs/lib/TS_Server_Handler.cpp b/netsvcs/lib/TS_Server_Handler.cpp index d0a87fd4c84..74745f9d362 100644 --- a/netsvcs/lib/TS_Server_Handler.cpp +++ b/netsvcs/lib/TS_Server_Handler.cpp @@ -38,15 +38,15 @@ template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ int -ACE_TS_Server_Acceptor::parse_args (int argc, ACE_TCHAR *argv[]) +ACE_TS_Server_Acceptor::parse_args (int argc, char *argv[]) { ACE_TRACE ("ACE_TS_Server_Acceptor::parse_args"); int service_port = ACE_DEFAULT_SERVER_PORT; - ACE_LOG_MSG->open (ACE_TEXT ("Time Service")); + ACE_LOG_MSG->open ("Time Service"); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0); + ACE_Get_Opt get_opt (argc, argv, "p:", 0); for (int c; (c = get_opt ()) != -1; ) { @@ -57,7 +57,7 @@ ACE_TS_Server_Acceptor::parse_args (int argc, ACE_TCHAR *argv[]) break; default: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%n:\n[-p server-port]\n"), 1), + "%n:\n[-p server-port]\n%a", 1), -1); } } @@ -66,9 +66,9 @@ ACE_TS_Server_Acceptor::parse_args (int argc, ACE_TCHAR *argv[]) } int -ACE_TS_Server_Acceptor::init (int argc, ACE_TCHAR *argv[]) +ACE_TS_Server_Acceptor::init (int argc, char *argv[]) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Acceptor::init")); + ACE_TRACE ("ACE_TS_Server_Acceptor::init"); // Use the options hook to parse the command line arguments and set // options. @@ -79,11 +79,10 @@ ACE_TS_Server_Acceptor::init (int argc, ACE_TCHAR *argv[]) if (this->open (this->service_addr_, ACE_Reactor::instance (), 0, 0, 0, &this->scheduling_strategy_, - ACE_TEXT ("Time Server"), - ACE_TEXT ("ACE time service")) == -1) + "Time Server", "ACE time service") == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%n: %p on port %d\n"), - ACE_TEXT ("acceptor::open failed"), + "%n: %p on port %d\n", + "acceptor::open failed", this->service_addr_.get_port_number ()), -1); @@ -97,14 +96,14 @@ ACE_TS_Server_Acceptor::init (int argc, ACE_TCHAR *argv[]) // Figure out what port we're really bound to. if (this->acceptor ().get_local_addr (server_addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("get_local_addr")), + "%p\n", + "get_local_addr"), -1); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("starting up Time Server at port %d on handle %d\n"), - server_addr.get_port_number (), - this->acceptor ().get_handle ())); + "starting up Time Server at port %d on handle %d\n", + server_addr.get_port_number (), + this->acceptor ().get_handle ())); return 0; } @@ -117,7 +116,7 @@ ACE_SVC_FACTORY_DEFINE (ACE_TS_Server_Acceptor) ACE_TS_Server_Handler::ACE_TS_Server_Handler (ACE_Thread_Manager *tm) : ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> (tm) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::ACE_TS_Server_Handler")); + ACE_TRACE ("ACE_TS_Server_Handler::ACE_TS_Server_Handler"); } // Activate this instance of the ACE_TS_Server_Handler (called by the @@ -126,27 +125,27 @@ ACE_TS_Server_Handler::ACE_TS_Server_Handler (ACE_Thread_Manager *tm) /* VIRTUAL */ int ACE_TS_Server_Handler::open (void *) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::open")); + ACE_TRACE ("ACE_TS_Server_Handler::open"); ACE_INET_Addr client_addr; // Determine the address of the client and display it. if (this->peer ().get_remote_addr (client_addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("get_remote_addr")), + "%p\n", + "get_remote_addr"), -1); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) accepted connection from host %s on fd %d\n"), + "(%t) accepted connection from host %s on fd %d\n", client_addr.get_host_name (), this->peer ().get_handle ())); // Call down to our parent to register ourselves with the Reactor. if (ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>::open (0) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("open")), + "%p\n", + "open"), -1); return 0; } @@ -154,22 +153,22 @@ ACE_TS_Server_Handler::open (void *) /* VIRTUAL */ int ACE_TS_Server_Handler::send_request (ACE_Time_Request &request) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::send_request")); + ACE_TRACE ("ACE_TS_Server_Handler::send_request"); void *buffer; ssize_t length = request.encode (buffer); if (length == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("encode failed")), + "%p\n", + "encode failed"), -1); // Transmit request via a blocking send. if (this->peer ().send_n (buffer, length) != length) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("send_n failed")), + "%p\n", + "send_n failed"), -1); return 0; } @@ -180,7 +179,7 @@ ACE_TS_Server_Handler::send_request (ACE_Time_Request &request) /* VIRTUAL */ int ACE_TS_Server_Handler::abandon (void) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::abandon")); + ACE_TRACE ("ACE_TS_Server_Handler::abandon"); // Note we are using the time field to report the errno in case of // failure. @@ -192,7 +191,7 @@ ACE_TS_Server_Handler::abandon (void) /* VIRTUAL */ int ACE_TS_Server_Handler::handle_timeout (const ACE_Time_Value &, const void *) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::handle_timeout")); + ACE_TRACE ("ACE_TS_Server_Handler::handle_timeout"); return this->abandon (); } @@ -201,7 +200,7 @@ ACE_TS_Server_Handler::handle_timeout (const ACE_Time_Value &, const void *) /* VIRTUAL */ ACE_HANDLE ACE_TS_Server_Handler::get_handle (void) const { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::get_handle")); + ACE_TRACE ("ACE_TS_Server_Handler::get_handle"); return this->peer ().get_handle (); } @@ -210,7 +209,7 @@ ACE_TS_Server_Handler::get_handle (void) const /* VIRTUAL */ int ACE_TS_Server_Handler::dispatch (void) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::dispatch")); + ACE_TRACE ("ACE_TS_Server_Handler::dispatch"); // Get the system time and then create an ACE_Time_Request time_t t = ACE_OS::time (0); ACE_Time_Request rq (ACE_Time_Request::TIME_UPDATE, t); @@ -223,7 +222,7 @@ ACE_TS_Server_Handler::dispatch (void) /* VIRTUAL */ int ACE_TS_Server_Handler::recv_request (void) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::recv_request")); + ACE_TRACE ("ACE_TS_Server_Handler::recv_request"); ssize_t bytes_expected = this->time_request_.size (); // Since Time_Request messages are fixed size, read the entire @@ -235,12 +234,11 @@ ACE_TS_Server_Handler::recv_request (void) { case -1: /* FALLTHROUGH */ - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("****************** recv_request returned -1\n"))); + ACE_DEBUG ((LM_DEBUG, "****************** recv_request returned -1\n")); default: ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p got %d bytes, expected %d bytes\n"), - ACE_TEXT ("recv failed"), + "%p got %d bytes, expected %d bytes\n", + "recv failed", n, bytes_expected)); /* FALLTHROUGH */ @@ -257,9 +255,7 @@ ACE_TS_Server_Handler::recv_request (void) // Decode the request into host byte order. if (this->time_request_.decode () == -1) { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("decode failed"))); + ACE_ERROR ((LM_ERROR, "%p\n", "decode failed")); return this->abandon (); } } @@ -272,7 +268,7 @@ ACE_TS_Server_Handler::recv_request (void) /* VIRTUAL */ int ACE_TS_Server_Handler::handle_input (ACE_HANDLE) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::handle_input")); + ACE_TRACE ("ACE_TS_Server_Handler::handle_input"); if (this->recv_request () == -1) return -1; @@ -282,8 +278,8 @@ ACE_TS_Server_Handler::handle_input (ACE_HANDLE) ACE_TS_Server_Handler::~ACE_TS_Server_Handler (void) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::~ACE_TS_Server_Handler")); + ACE_TRACE ("ACE_TS_Server_Handler::~ACE_TS_Server_Handler"); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("closing down Handle %d\n"), + "closing down Handle %d\n", this->get_handle ())); } diff --git a/netsvcs/lib/TS_Server_Handler.h b/netsvcs/lib/TS_Server_Handler.h index 4aee2da517e..3ab5e51427a 100644 --- a/netsvcs/lib/TS_Server_Handler.h +++ b/netsvcs/lib/TS_Server_Handler.h @@ -100,10 +100,10 @@ class ACE_TS_Server_Acceptor : public ACE_Strategy_Acceptor<ACE_TS_Server_Handle // easily be factored into the <ACE_Strategy_Acceptor>. public: - virtual int init (int argc, ACE_TCHAR *argv[]); + virtual int init (int argc, char *argv[]); // Dynamic linking hook. - int parse_args (int argc, ACE_TCHAR *argv[]); + int parse_args (int argc, char *argv[]); // Parse svc.conf arguments. private: diff --git a/netsvcs/servers/Makefile.am b/netsvcs/servers/Makefile.am index b1dbc676a98..6e1c58949a2 100644 --- a/netsvcs/servers/Makefile.am +++ b/netsvcs/servers/Makefile.am @@ -1,33 +1,21 @@ -## Process this file with automake to create Makefile.in +##---------------------------------------------------------------------------- +## $Id$ ## -## $Id$ +## Makefile.am for the netsvcs server example +##---------------------------------------------------------------------------- + ## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. +## Process this file with automake to create Makefile.in ## -## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu -ACE_ROOT = $(top_srcdir) -ACE_BUILDDIR = $(top_builddir) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/netsvcs/lib -## Makefile.Netsvcs_server.am noinst_PROGRAMS = main -main_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/netsvcs/lib - -main_SOURCES = \ - main.cpp +main_SOURCES = main.cpp +main_LDADD = $(top_builddir)/netsvcs/lib/libnetsvcs.la \ + $(top_builddir)/ace/libACE.la -main_LDADD = \ - $(top_builddir)/netsvcs/lib/libnetsvcs.la $(top_builddir)/ace/libACE.la +noinst_DATA = svc.conf -## Clean up template repositories, etc. -clean-local: - -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core - -rm -f gcctemp.c gcctemp so_locations - -rm -rf ptrepository SunWS_cache Templates.DB +EXTRA_DIST = $(noinst_DATA) diff --git a/netsvcs/servers/main.cpp b/netsvcs/servers/main.cpp index b134b8db7c7..bd75b4e046f 100644 --- a/netsvcs/servers/main.cpp +++ b/netsvcs/servers/main.cpp @@ -12,7 +12,7 @@ ACE_RCSID(servers, main, "$Id$") int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) +main (int argc, char *argv[]) { // Try to link in the svc.conf entries dynamically. @@ -25,8 +25,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { if (errno != ENOENT) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("open")), + "%p\n", + "open"), 1); else // Use static linking. { @@ -39,83 +39,76 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // ACE_Service_Object_Ptr which is an <auto_ptr> specialized // for ACE_Service_Object. - ACE_TCHAR *l_argv[3]; - ACE_TCHAR name_port[] = - ACE_TEXT ("-p ") ACE_DEFAULT_NAME_SERVER_PORT_STR; + char *l_argv[3]; + char name_port[] = "-p " ACE_DEFAULT_NAME_SERVER_PORT_STR; l_argv[0] = name_port; l_argv[1] = 0; ACE_Service_Object_Ptr sp_1 = ACE_SVC_INVOKE (ACE_Name_Acceptor); if (sp_1->init (1, l_argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Name Service")), - 1); + ACE_ERROR ((LM_ERROR, + "%p\n%a", + "Name Service", + 1)); - ACE_TCHAR time_port[] = - ACE_TEXT ("-p ") ACE_DEFAULT_TIME_SERVER_PORT_STR; + char time_port[] = "-p " ACE_DEFAULT_TIME_SERVER_PORT_STR; l_argv[0] = time_port; l_argv[1] = 0; ACE_Service_Object_Ptr sp_2 = ACE_SVC_INVOKE (ACE_TS_Server_Acceptor); if (sp_2->init (1, l_argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("TS Server Acceptor")), - 1); + ACE_ERROR ((LM_ERROR, + "%p\n%a", + "TS Server Acceptor", 1)); - ACE_TCHAR clerk_port[] = ACE_TEXT ("-p 10011"); + char clerk_port[] = "-p 10011"; l_argv[0] = argv[0]; l_argv[1] = clerk_port; l_argv[2] = 0; ACE_Service_Object_Ptr sp_3 = ACE_SVC_INVOKE (ACE_TS_Clerk_Processor); if (sp_3->init (2, l_argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("TS Clerk Processor")), - 1); + ACE_ERROR ((LM_ERROR, + "%p\n%a", + "TS Clerk Processor", + 1)); #if defined (ACE_HAS_TOKENS_LIBRARY) - ACE_TCHAR token_port[] = - ACE_TEXT ("-p ") ACE_DEFAULT_TOKEN_SERVER_PORT_STR; + char token_port[] = "-p " ACE_DEFAULT_TOKEN_SERVER_PORT_STR; l_argv[0] = token_port; l_argv[1] = 0; ACE_Service_Object_Ptr sp_4 = ACE_SVC_INVOKE (ACE_Token_Acceptor); if (sp_4->init (1, l_argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Token Service")), - 1); + ACE_ERROR ((LM_ERROR, + "%p\n%a", + "Token Service", + 1)); #endif /* ACE_HAS_TOKENS_LIBRARY */ - ACE_TCHAR thr_logging_port[] = - ACE_TEXT ("-p ") ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR; + char thr_logging_port[] = "-p " ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR; l_argv[0] = thr_logging_port; l_argv[1] = 0; ACE_Service_Object_Ptr sp_5 = ACE_SVC_INVOKE (ACE_Thr_Server_Logging_Acceptor); if (sp_5->init (1, l_argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Threaded Logging Server")), - 1); + ACE_ERROR ((LM_ERROR, + "%p\n%a", + "Threaded Logging Server", + 1)); - ACE_TCHAR logging_port[] = - ACE_TEXT ("-p ") ACE_DEFAULT_LOGGING_SERVER_PORT_STR; + char logging_port[] = "-p " ACE_DEFAULT_LOGGING_SERVER_PORT_STR; l_argv[0] = logging_port; l_argv[1] = 0; ACE_Service_Object_Ptr sp_6 = ACE_SVC_INVOKE (ACE_Server_Logging_Acceptor); if (sp_6->init (1, l_argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Logging Server")), - 1); + ACE_ERROR ((LM_ERROR, + "%p\n%a", + "Logging Server", 1)); l_argv[0] = logging_port; l_argv[1] = 0; @@ -123,10 +116,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_SVC_INVOKE (ACE_Client_Logging_Acceptor); if (sp_7->init (1, l_argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Logging Client")), - 1); + ACE_ERROR ((LM_ERROR, + "%p\n%a", + "Logging Client", + 1)); // Run forever, performing the configured services until we // are shut down by a SIGINT/SIGQUIT signal. @@ -138,11 +131,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) sig_set.sig_add (SIGQUIT); if (ACE_Reactor::instance ()->register_handler (sig_set, &sa) == -1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("register signals"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"))); else - ACE_Reactor::instance ()->run_reactor_event_loop (); + ACE_Reactor::run_event_loop (); // Destructors of ACE_Service_Object_Ptr's automagically // call fini(). @@ -167,11 +158,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // gracefully. if (ACE_Reactor::instance ()->register_handler (sig_set, &sa) == -1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("register signals2"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"))); else - ACE_Reactor::instance ()->run_reactor_event_loop (); + ACE_Reactor::run_event_loop (); } return 0; |