diff options
34 files changed, 69 insertions, 72 deletions
@@ -326,6 +326,12 @@ private: #define ACE_UNUSED_ARG(a) (a) #endif /* ghs */ +#if defined(__sgi) || defined(VXWORKS) +#define ACE_NOTREACHED(a) +#else +#define ACE_NOTREACHED(a) a +#endif + #if defined (ACE_REQUIRES_FUNC_DEFINITIONS) // Provide a null definition for the function. Not pleasant. # define ACE_UNIMPLEMENTED_FUNC(f) f {} diff --git a/apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp b/apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp index d0fe542b299..fb24265b6f5 100644 --- a/apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp +++ b/apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp @@ -591,7 +591,7 @@ Thr_Supplier_Proxy::svc (void) ACE_OS::sleep (tv); } } - return 0; + ACE_NOTREACHED(return 0); } #endif /* ACE_HAS_THREADS */ diff --git a/apps/Gateway/Gateway/Makefile b/apps/Gateway/Gateway/Makefile index 9b19f89b16e..5e4560a0170 100644 --- a/apps/Gateway/Gateway/Makefile +++ b/apps/Gateway/Gateway/Makefile @@ -27,7 +27,6 @@ LOBJ = $(addsuffix .o,$(FILES)) SHOBJ = $(addsuffix .so,$(FILES)) LDLIBS = -lGateway -LIBS = -lACE VLDLIBS = $(LDLIBS:%=%$(VAR)) diff --git a/apps/JAWS/clients/Blobby/Blob_Handler.cpp b/apps/JAWS/clients/Blobby/Blob_Handler.cpp index 34130d4f4ed..4a166ad1ff6 100644 --- a/apps/JAWS/clients/Blobby/Blob_Handler.cpp +++ b/apps/JAWS/clients/Blobby/Blob_Handler.cpp @@ -330,7 +330,7 @@ ACE_Blob_Writer::receive_reply (void) char *description = ACE_OS::strtok_r (NULL, "\n\r", &lasts); ACE_ERROR_RETURN((LM_ERROR, "%p\n", description), -1); } - return 0; + ACE_NOTREACHED(return 0); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/apps/JAWS/server/HTTP_Server.cpp b/apps/JAWS/server/HTTP_Server.cpp index 9523bb87d51..4fd60d00677 100644 --- a/apps/JAWS/server/HTTP_Server.cpp +++ b/apps/JAWS/server/HTTP_Server.cpp @@ -129,7 +129,7 @@ HTTP_Server::init (int argc, char *argv[]) default: return this->synch_thread_pool (); } - return 0; + ACE_NOTREACHED(return 0); } int @@ -205,14 +205,7 @@ Synch_Thread_Pool_Task::svc (void) " (%t) in Synch_Thread_Pool_Task::svc, recycling\n")); } - // This stinks, because I am afraid that if I remove this line, some - // compiler will issue a warning that this routine could exit - // without returning a value. But, leaving it in makes the VXWORKS - // compiler complain about an unreachable statement. - -#if ! defined(VXWORKS) - return 0; -#endif /* VXWORKS */ + ACE_NOTREACHED(return 0); } int @@ -254,14 +247,7 @@ HTTP_Server::thread_per_request (void) this->tm_.wait (&wait_time); } - // This stinks, because I am afraid that if I remove this line, some - // compiler will issue a warning that this routine could exit - // without returning a value. But, leaving it in makes the VXWORKS - // compiler complain about an unreachable statement. - -#if ! defined(VXWORKS) - return 0; -#endif /* VXWORKS */ + ACE_NOTREACHED(return 0); } Thread_Per_Request_Task::Thread_Per_Request_Task (ACE_HANDLE handle, diff --git a/apps/JAWS/server/Makefile b/apps/JAWS/server/Makefile index b32ad05f13c..a87b7f2eda0 100644 --- a/apps/JAWS/server/Makefile +++ b/apps/JAWS/server/Makefile @@ -28,7 +28,6 @@ LOBJ = $(addsuffix .o,$(FILES)) VLDLIBS = $(LDLIBS:%=%$(VAR)) LDLIBS = -lJAWS -LIBS = -lACE BUILD = $(VOBJS) $(VLIB) $(VBIN) diff --git a/bin/create_ace_build b/bin/create_ace_build index 7824e7896dc..9e1b3911fd0 100755 --- a/bin/create_ace_build +++ b/bin/create_ace_build @@ -33,10 +33,14 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # full path to perl, as long as it is in the user's PATH. # Taken from perlrun man page. -$usage = "usage: $0 -? | [-d <directory mode>] [-v] <build name>\n"; +$usage = "usage: $0 -? | [-a] [-d <directory mode>] [-v] <build name>\n"; $directory_mode = 042755; #### fine on Suns, but maybe not all Unix platforms $verbose = 0; +$source='.'; +$absolute= 0; + +require Cwd; #### #### process command line args @@ -51,6 +55,9 @@ while ( $#ARGV >= 0 && $ARGV[0] =~ /^-/ ) { warn "$0: must provide argument for -d option\n"; die $usage; } + } elsif ($ARGV[0] eq '-a' ) { + $source = Cwd::getcwd(); + $absolute = 1; } elsif ( $ARGV[0] eq '-?' ) { print "$usage"; exit; @@ -81,7 +88,8 @@ $build = "build/$build"; #### #### Get all ACE plain file and directory names. #### -@files = ( `/usr/bin/find . -name CVS -prune -o -name build -prune -o \\\ +@files = ( `/usr/bin/find . -name CVS -prune \\\ + -o -name build -prune -o \\\ -name '.*obj' -prune -o -name Templates.DB -prune -o \\\ \\( ! -type l ! -name core ! -name '*.state' ! -name '*.so' \\\ ! -name '*.[oa]' ! -name '*~' ! -name '.' ! -name '.#*' \\\ @@ -92,22 +100,29 @@ $build = "build/$build"; #### Create directories and symlinks to files. #### foreach $file ( @files ) { - chop $file; #### remove trailing newline (from find command above) - $file =~ s%^\./%%g; #### excise leading ./ directory component + chop $file; #### remove trailing newline (from find command above) + $file =~ s%^./%%g; #### excise leading ./ directory component - if ( -d $file ) { + if ( -d $file ) { unless ( -d "$build/$file" ) { print "mkdir $build/$file, $directory_mode\n" if $verbose; mkdir "$build/$file", $directory_mode; } } else { unless ( -e "$build/$file" ) { - $up = '../..'; - while ( $file =~ m%/%g ) { $up .= '/..'; } - - print "symlink $up/$file $build/$file\n" if $verbose; - symlink "$up/$file", "$build/$file" || + if (!$absolute) { + $up = '../..'; + while ( $file =~ m%/%g ) { $up .= '/..'; } + + print "symlink $up/$file $build/$file\n" if $verbose; + symlink "$up/$file", "$build/$file" || die "$0 symlink to $build/$file failed\n"; + } else { + $path = $source . '/' . $file; + print "symlink $path $build/$file\n" if $verbose; + symlink "$path", "$build/$file" + || die "$0 symlink to $build/$file failed\n"; + } } } } @@ -116,8 +131,13 @@ foreach $file ( @files ) { #### If this is for an ACE top-level directory, create ChangeLog symlink. #### unless ( -e "$build/ChangeLog" ) { - symlink '../../ChangeLog', "$build/ChangeLog" || - die "$0: unable to create $build/ChangeLog symlink\n"; + if (!$absolute) { + symlink "../../ChangeLog", "$build/ChangeLog" || + die "$0: unable to create $build/ChangeLog symlink\n"; + } else { + symlink "$source/ChangeLog", "$build/ChangeLog" || + die "$0: unable to create $build/ChangeLog symlink\n"; + } } #### diff --git a/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp b/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp index e1b3846a575..3e7b677e07e 100644 --- a/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp +++ b/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp @@ -100,7 +100,7 @@ Peer_Handler<ROUTER, KEY>::svc (void) // return this->router_task_->reply (hb) == -1 ? -1 : 0; } } - return 0; + ACE_NOTREACHED(return 0); } template <class ROUTER, class KEY> int diff --git a/examples/Connection/non_blocking/Makefile b/examples/Connection/non_blocking/Makefile index 4dc67d06791..ed89cb4d70b 100644 --- a/examples/Connection/non_blocking/Makefile +++ b/examples/Connection/non_blocking/Makefile @@ -27,7 +27,6 @@ LSRC = CPP-connector.cpp \ CPP-acceptor.cpp LDLIBS = -lConn -LIBS = -lACE VLDLIBS = $(LDLIBS:%=%$(VAR)) diff --git a/examples/IPC_SAP/DEV_SAP/reader/Makefile b/examples/IPC_SAP/DEV_SAP/reader/Makefile index 5a71c4f7da4..832ab80beae 100644 --- a/examples/IPC_SAP/DEV_SAP/reader/Makefile +++ b/examples/IPC_SAP/DEV_SAP/reader/Makefile @@ -18,8 +18,6 @@ LSRC = $(addsuffix .cpp,$(FILES)) LOBJ = $(addsuffix .o,$(FILES)) SHOBJ = $(addsuffix .so,$(FILES)) -LIBS = -lACE - VLDLIBS = $(LDLIBS:%=%$(VAR)) BUILD = $(VBIN) diff --git a/examples/IPC_SAP/DEV_SAP/writer/Makefile b/examples/IPC_SAP/DEV_SAP/writer/Makefile index d6f16bb4399..7dc354c7f84 100644 --- a/examples/IPC_SAP/DEV_SAP/writer/Makefile +++ b/examples/IPC_SAP/DEV_SAP/writer/Makefile @@ -18,8 +18,6 @@ LSRC = $(addsuffix .cpp,$(FILES)) LOBJ = $(addsuffix .o,$(FILES)) SHOBJ = $(addsuffix .so,$(FILES)) -LIBS = -lACE - VLDLIBS = $(LDLIBS:%=%$(VAR)) BUILD = $(VBIN) diff --git a/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp b/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp index 8b5f7f727a0..39b8e0ff358 100644 --- a/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp +++ b/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp @@ -48,5 +48,5 @@ main (int /* argc */, char * /* argv */ []) new_stream.close (); } } - return 0; + ACE_NOTREACHED(return 0); } diff --git a/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp b/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp index 033dacb04ab..1e7c53dffef 100644 --- a/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp +++ b/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp @@ -44,6 +44,5 @@ main (int argc, char *argv[]) int main (void) { ACE_ERROR_RETURN ((LM_ERROR, "this feature is not supported"), -1); - return 0; } #endif /* ACE_HAS_STREAM_PIPES */ diff --git a/examples/Reactor/Dgram/CODgram.cpp b/examples/Reactor/Dgram/CODgram.cpp index 6a968f68d56..1e23aa947ef 100644 --- a/examples/Reactor/Dgram/CODgram.cpp +++ b/examples/Reactor/Dgram/CODgram.cpp @@ -118,5 +118,5 @@ int main(int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, ".\n")); } - return 0; + ACE_NOTREACHED(return 0); } diff --git a/examples/Reactor/Dgram/Dgram.cpp b/examples/Reactor/Dgram/Dgram.cpp index 823cac4237f..a20804e6c40 100644 --- a/examples/Reactor/Dgram/Dgram.cpp +++ b/examples/Reactor/Dgram/Dgram.cpp @@ -117,5 +117,5 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, ".\n")); } - return 0; + ACE_NOTREACHED(return 0); } diff --git a/examples/Reactor/Misc/test_demuxing.cpp b/examples/Reactor/Misc/test_demuxing.cpp index 8228529aa25..4694463a887 100644 --- a/examples/Reactor/Misc/test_demuxing.cpp +++ b/examples/Reactor/Misc/test_demuxing.cpp @@ -257,7 +257,7 @@ Message_Handler::svc (void) } } - return 0; + ACE_NOTREACHED(return 0); } int diff --git a/examples/Reactor/Misc/test_reactors.cpp b/examples/Reactor/Misc/test_reactors.cpp index ddaf7a95f7f..31c6c4af31e 100644 --- a/examples/Reactor/Misc/test_reactors.cpp +++ b/examples/Reactor/Misc/test_reactors.cpp @@ -151,7 +151,7 @@ worker (void *args) } - return 0; + ACE_NOTREACHED(return 0); } int diff --git a/examples/Reactor/Misc/test_signals_2.cpp b/examples/Reactor/Misc/test_signals_2.cpp index 568ca2515f4..2fba1d942f3 100644 --- a/examples/Reactor/Misc/test_signals_2.cpp +++ b/examples/Reactor/Misc/test_signals_2.cpp @@ -217,7 +217,7 @@ main (int argc, char *) if (reactor.handle_events () == -1) ACE_ERROR ((LM_ERROR, "%p\n", "handle_events")); } - return 0; + ACE_NOTREACHED(return 0); } #else int diff --git a/examples/Service_Configurator/IPC-tests/server/Makefile b/examples/Service_Configurator/IPC-tests/server/Makefile index 8c809ee5950..1cfca47c61e 100644 --- a/examples/Service_Configurator/IPC-tests/server/Makefile +++ b/examples/Service_Configurator/IPC-tests/server/Makefile @@ -28,7 +28,6 @@ SRC = $(addsuffix .cpp,$(BIN)) OBJ = $(SRC:%.cpp=$(VDIR)%.o) LSRC = $(addsuffix .cpp,$(FILES)) -LIBS = -lACE VLDLIBS = $(LDLIBS:%=%$(VAR)) diff --git a/examples/Threads/barrier2.cpp b/examples/Threads/barrier2.cpp index bc1d1df1648..00d7229856c 100644 --- a/examples/Threads/barrier2.cpp +++ b/examples/Threads/barrier2.cpp @@ -179,7 +179,7 @@ Worker_Task<BARRIER>::Producer (void) return -1; } - return 0; + ACE_NOTREACHED(return 0); } template <class BARRIER>int diff --git a/examples/Threads/process_manager.cpp b/examples/Threads/process_manager.cpp index 99f6677f4f6..9b7a489d5cb 100644 --- a/examples/Threads/process_manager.cpp +++ b/examples/Threads/process_manager.cpp @@ -58,7 +58,7 @@ sig_handler (void *) } } - break; + /* NOTREACHED */ case -1: ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "sigwait"), 0); /* NOTREACHED */ diff --git a/examples/Threads/task_three.cpp b/examples/Threads/task_three.cpp index 66ac7b141ee..285921b2aea 100644 --- a/examples/Threads/task_three.cpp +++ b/examples/Threads/task_three.cpp @@ -151,7 +151,7 @@ dispatch (void *arg) ACE_DEBUG ((LM_DEBUG, "Dispatch: handle_events (): %d", result)); } - return 0; + ACE_NOTREACHED(return 0); } extern "C" void diff --git a/include/makeinclude/platform_irix6.x-sgic++.GNU b/include/makeinclude/platform_irix6.x-sgic++.GNU index 43d431c105e..6dcf5f11ccf 100644 --- a/include/makeinclude/platform_irix6.x-sgic++.GNU +++ b/include/makeinclude/platform_irix6.x-sgic++.GNU @@ -17,16 +17,12 @@ CCFLAGS += -O # Enable exceptions even in the o32 bit ABI. CCFLAGS += -exceptions -# This suppresses common compiler warnings which appear in the -# ACE code but should not matter. The warnings can be turned on -# again by removing the -woff clause in the CPPFLAGS definition. -# CCFLAGS += -woff 1188,1682,1171,1681,1110 - # Instantiate no templates automatically, do not run prelinker. There -# are other choices available, but you should check for those. +# are other choices available, but those have not been used in a while. CCFLAGS += -ptnone -no_prelink # Instantiate everything; without this, apps/Gateway/Gateway/gatewayd might -# not build due to missing template instantiations. +# not build due to missing template instantiations. NOTE: it seems +# this setting no longer works for ACE. #CCFLAGS += -ptall # Instantiate used templates, plus prelinking instantiation #CCFLAGS += -ptused -prelink @@ -38,9 +34,11 @@ LDFLAGS += -Wl,-woff,15 LDFLAGS += -Wl,-woff,84 LDFLAGS += -Wl,-woff,85 LDFLAGS += -Wl,-woff,133 + # You may need to remove this if you are using 6.2 without the Pthread # patches. LIBS += -lpthread + PIC = -KPIC AR = ar ARFLAGS = r diff --git a/include/makeinclude/rules.nested.GNU b/include/makeinclude/rules.nested.GNU index 1ac088b3bd9..5bd378ea743 100644 --- a/include/makeinclude/rules.nested.GNU +++ b/include/makeinclude/rules.nested.GNU @@ -7,9 +7,7 @@ $(TARGETS_NESTED): @for dir in $(DIRS) ;\ do \ - (cd $$dir ; \ - echo "" ; \ - echo " ========> Making $(@:.nested=) $(MAKEFLAGS): `pwd`"; \ - $(MAKE) $(@:.nested=) MAKEFLAGS=$(MAKEFLAGS) ; \ + (echo " ========> Making $(@:.nested=): `pwd`"; \ + $(MAKE) -C $$dir $(@:.nested=); \ echo "<======== End $(@:.nested=): `pwd`") ; \ done diff --git a/netsvcs/clients/Naming/Client/Makefile b/netsvcs/clients/Naming/Client/Makefile index 8a79d7f9d72..b0dd44863c7 100644 --- a/netsvcs/clients/Naming/Client/Makefile +++ b/netsvcs/clients/Naming/Client/Makefile @@ -22,7 +22,6 @@ LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) SHOBJ = $(addsuffix .so,$(FILES)) LDLIBS = -lClient_Test -LIBS = -lACE VLDLIBS = $(LDLIBS:%=%$(VAR)) diff --git a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp index e06b09ff499..8da40118d9a 100644 --- a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp +++ b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp @@ -314,7 +314,7 @@ Dump_Restore::populate (Dump_Restore::Operation_Type op) break; default: ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "populate"), -1); - break; + /* NOTREACHED */ } } diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile b/netsvcs/clients/Naming/Dump_Restore/Makefile index bad14bdf9b7..16d963407a7 100644 --- a/netsvcs/clients/Naming/Dump_Restore/Makefile +++ b/netsvcs/clients/Naming/Dump_Restore/Makefile @@ -22,7 +22,6 @@ LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) SHOBJ = $(addsuffix .so,$(FILES)) LDLIBS = -lDump_Restore -LIBS += -lACE VLDLIBS = $(LDLIBS:%=%$(VAR)) diff --git a/netsvcs/clients/Tokens/collection/collection.cpp b/netsvcs/clients/Tokens/collection/collection.cpp index 44a58ffec02..6d481a976b8 100644 --- a/netsvcs/clients/Tokens/collection/collection.cpp +++ b/netsvcs/clients/Tokens/collection/collection.cpp @@ -122,7 +122,7 @@ parse_args (int argc, char *argv[]) "[-p <remote port>]\n" "[-n <iterations>]\n" "[-d debug]\n", 1), -1); - break; + /* NOTREACHED */ } } diff --git a/netsvcs/clients/Tokens/mutex/test_mutex.cpp b/netsvcs/clients/Tokens/mutex/test_mutex.cpp index f70c4062b3c..1161928f477 100644 --- a/netsvcs/clients/Tokens/mutex/test_mutex.cpp +++ b/netsvcs/clients/Tokens/mutex/test_mutex.cpp @@ -102,7 +102,7 @@ parse_args (int argc, char *argv[]) "[-t <threads>]\n" "[-h <remote host>]\n" "[-p <remote port>]\n", 1), -1); - break; + /* NOTREACHED */ } } diff --git a/performance-tests/Misc/childbirth_time.cpp b/performance-tests/Misc/childbirth_time.cpp index 9772bfd3c8a..66422bcb492 100644 --- a/performance-tests/Misc/childbirth_time.cpp +++ b/performance-tests/Misc/childbirth_time.cpp @@ -137,9 +137,10 @@ prof_fork (size_t iteration) { case -1: ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "process.spawn"), -1); - break; + /* NOTREACHED */ case 0: exit (0); + /* NOTREACHED */ break; default: ptimer.stop (); diff --git a/performance-tests/Synch-Benchmarks/Makefile b/performance-tests/Synch-Benchmarks/Makefile index 94b26845a7e..c783d9e2b17 100644 --- a/performance-tests/Synch-Benchmarks/Makefile +++ b/performance-tests/Synch-Benchmarks/Makefile @@ -35,7 +35,6 @@ LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) SHOBJ = $(addsuffix .so,$(FILES)) LDLIBS = -lSynch_Tests -LIBS += -lACE VLDLIBS = $(LDLIBS:%=%$(VAR)) diff --git a/tests/Reactor_Exceptions_Test.cpp b/tests/Reactor_Exceptions_Test.cpp index 768de96b7d0..df7b50a7f4b 100644 --- a/tests/Reactor_Exceptions_Test.cpp +++ b/tests/Reactor_Exceptions_Test.cpp @@ -68,7 +68,7 @@ MemoryEx::handle_input (ACE_HANDLE) #else throw Except (); #endif - return 0; + ACE_NOTREACHED(return 0); } class My_Reactor : public ACE_Reactor @@ -103,7 +103,7 @@ worker (void) if (ACE_Reactor::instance()->handle_events () == -1) ACE_ERROR_RETURN ((LM_ERROR, "(%t) error return\n"), -1); - return 0; + ACE_NOTREACHED(return 0); } #endif /* ACE_HAS_EXCEPTIONS */ diff --git a/tests/Reactors_Test.cpp b/tests/Reactors_Test.cpp index 021777446b1..047c1bef5e9 100644 --- a/tests/Reactors_Test.cpp +++ b/tests/Reactors_Test.cpp @@ -168,7 +168,7 @@ worker (void *args) } } - return 0; + ACE_NOTREACHED(return 0); } #endif /* ACE_HAS_THREADS */ diff --git a/tests/SOCK_Test.cpp b/tests/SOCK_Test.cpp index 17262fc995d..37e143fc0d3 100644 --- a/tests/SOCK_Test.cpp +++ b/tests/SOCK_Test.cpp @@ -199,7 +199,7 @@ server (void *arg) ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "accept")); } } - return 0; + ACE_NOTREACHED(return 0); } static void |